diff --git a/.bzrignore b/.bzrignore
index 9aa0bfae5c..47f754ef3c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -29,3 +29,4 @@ src/cssutils/scripts/
 src/cssutils/css/.svn/
 src/cssutils/stylesheets/.svn/
 src/odf/.svn
+tags
diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py
index 595d64d436..8524172a72 100644
--- a/installer/linux/freeze.py
+++ b/installer/linux/freeze.py
@@ -9,7 +9,7 @@ Create linux binary.
 '''
 
 def freeze():
-    import glob, sys, subprocess, tarfile, os, re, textwrap, shutil, cStringIO, bz2, codecs
+    import glob, sys, tarfile, os, textwrap, shutil
     from contextlib import closing
     from cx_Freeze import Executable, setup
     from calibre.constants import __version__, __appname__
@@ -18,13 +18,13 @@ def freeze():
     from calibre.web.feeds.recipes import recipe_modules
     from calibre.ebooks.lrf.fonts import FONT_MAP
     import calibre
-    
+
 
     QTDIR          = '/usr/lib/qt4'
     QTDLLS         = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit')
-    
+
     binary_excludes = ['libGLcore*', 'libGL*', 'libnvidia*']
-    
+
     binary_includes = [
                        '/usr/bin/pdftohtml',
                        '/usr/lib/libunrar.so',
@@ -41,65 +41,66 @@ def freeze():
                        '/usr/lib/libxslt.so.1',
                        '/usr/lib/libxslt.so.1',
                        '/usr/lib/libgthread-2.0.so.0',
-                       '/usr/lib/libglib-2.0.so.0',
                        '/usr/lib/gcc/i686-pc-linux-gnu/4.3.3/libstdc++.so.6',
                        '/usr/lib/libpng12.so.0',
                        '/usr/lib/libexslt.so.0',
                        '/usr/lib/libMagickWand.so',
                        '/usr/lib/libMagickCore.so',
                        ]
-    
+
     binary_includes += [os.path.join(QTDIR, 'lib%s.so.4'%x) for x in QTDLLS]
-    
-    
+
+
     d = os.path.dirname
     CALIBRESRC = d(d(d(os.path.abspath(calibre.__file__))))
     CALIBREPLUGINS = os.path.join(CALIBRESRC, 'src', 'calibre', 'plugins')
     FREEZE_DIR = os.path.join(CALIBRESRC, 'build', 'cx_freeze')
     DIST_DIR   = os.path.join(CALIBRESRC, 'dist')
-    
+
     os.chdir(CALIBRESRC)
-    
+
     print 'Freezing calibre located at', CALIBRESRC
-    
+
     sys.path.insert(0, os.path.join(CALIBRESRC, 'src'))
-    
+
     entry_points = entry_points['console_scripts'] + entry_points['gui_scripts']
-    entry_points = ['calibre_postinstall=calibre.linux:binary_install', 
+    entry_points = ['calibre_postinstall=calibre.linux:binary_install',
                     'calibre-parallel=calibre.parallel:main'] + entry_points
     executables = {}
     for ep in entry_points:
         executables[ep.split('=')[0].strip()] = (ep.split('=')[1].split(':')[0].strip(),
                                                  ep.split(':')[-1].strip())
-    
+
     if os.path.exists(FREEZE_DIR):
         shutil.rmtree(FREEZE_DIR)
     os.makedirs(FREEZE_DIR)
-    
+
     if not os.path.exists(DIST_DIR):
         os.makedirs(DIST_DIR)
-    
+
     includes = [x[0] for x in executables.values()]
     includes += ['calibre.ebooks.lrf.fonts.prs500.'+x for x in FONT_MAP.values()]
-    
-    excludes = ['matplotlib', "Tkconstants", "Tkinter", "tcl", "_imagingtk", 
-                "ImageTk", "FixTk", 'wx', 'PyQt4.QtAssistant', 'PyQt4.QtOpenGL.so', 
+    includes += ['email.iterators', 'email.generator']
+
+
+    excludes = ['matplotlib', "Tkconstants", "Tkinter", "tcl", "_imagingtk",
+                "ImageTk", "FixTk", 'wx', 'PyQt4.QtAssistant', 'PyQt4.QtOpenGL.so',
                 'PyQt4.QtScript.so', 'PyQt4.QtSql.so', 'PyQt4.QtTest.so', 'qt',
                 'glib', 'gobject']
-    
-    packages = ['calibre', 'encodings', 'cherrypy', 'cssutils', 'xdg', 
-                'dateutil']
-    
+
+    packages = ['calibre', 'encodings', 'cherrypy', 'cssutils', 'xdg',
+                'dateutil', 'dns', 'email']
+
     includes += ['calibre.web.feeds.recipes.'+r for r in recipe_modules]
-    
+
     LOADER = '/tmp/loader.py'
     open(LOADER, 'wb').write('# This script is never actually used.\nimport sys')
-    
+
     INIT_SCRIPT = '/tmp/init.py'
     open(INIT_SCRIPT, 'wb').write(textwrap.dedent('''
     ## Load calibre module specified in the environment variable CALIBRE_CX_EXE
     ## Also restrict sys.path to the executables' directory and add the
-    ## executables directory to LD_LIBRARY_PATH 
+    ## executables directory to LD_LIBRARY_PATH
     import encodings
     import os
     import sys
@@ -107,26 +108,26 @@ def freeze():
     import zipimport
     import locale
     import codecs
-    
+
     enc = locale.getdefaultlocale()[1]
     if not enc:
         enc = locale.nl_langinfo(locale.CODESET)
     enc = codecs.lookup(enc if enc else 'UTF-8').name
     sys.setdefaultencoding(enc)
-    
+
     paths = os.environ.get('LD_LIBRARY_PATH', '').split(os.pathsep)
     if DIR_NAME not in paths or not sys.getfilesystemencoding():
         paths.insert(0, DIR_NAME)
         os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(paths)
         os.environ['PYTHONIOENCODING'] = enc
         os.execv(sys.executable, sys.argv)
-    
+
     sys.path = sys.path[:3]
     sys.frozen = True
     sys.frozen_path = DIR_NAME
-    
+
     executables = %(executables)s
-    
+
     exe = os.environ.get('CALIBRE_CX_EXE', False)
     ret = 1
     if not exe:
@@ -141,7 +142,7 @@ def freeze():
         module = __import__(module, fromlist=[1])
         func = getattr(module, func)
         ret = func()
-    
+
     module = sys.modules.get("threading")
     if module is not None:
         module._shutdown()
@@ -162,35 +163,35 @@ def freeze():
                           'init_script'     : INIT_SCRIPT,
                           'copy_dependent_files' : True,
                           'create_shared_zip'    : False,
-                          } 
+                          }
                          }
           )
-    
+
     def copy_binary(src, dest_dir):
         dest = os.path.join(dest_dir, os.path.basename(src))
         if not os.path.exists(dest_dir):
             os.makedirs(dest_dir)
         shutil.copyfile(os.path.realpath(src), dest)
         shutil.copymode(os.path.realpath(src), dest)
-    
+
     for f in binary_includes:
         copy_binary(f, FREEZE_DIR)
-    
+
     for pat in binary_excludes:
         matches = glob.glob(os.path.join(FREEZE_DIR, pat))
         for f in matches:
             os.remove(f)
-            
+
     print 'Adding calibre plugins...'
-    os.makedirs(os.path.join(FREEZE_DIR, 'plugins'))    
+    os.makedirs(os.path.join(FREEZE_DIR, 'plugins'))
     for f in glob.glob(os.path.join(CALIBREPLUGINS, '*.so')):
         copy_binary(f, os.path.join(FREEZE_DIR, 'plugins'))
-        
+
     print 'Adding Qt plugins...'
     plugdir = os.path.join(QTDIR, 'plugins')
     for dirpath, dirnames, filenames in os.walk(plugdir):
         for f in filenames:
-            if not f.endswith('.so') or 'designer' in dirpath or 'codecs' in dirpath or 'sqldrivers' in dirpath: 
+            if not f.endswith('.so') or 'designer' in dirpath or 'codecs' in dirpath or 'sqldrivers' in dirpath:
                 continue
             f = os.path.join(dirpath, f)
             dest_dir = dirpath.replace(plugdir, os.path.join(FREEZE_DIR, 'qtplugins'))
@@ -198,7 +199,7 @@ def freeze():
 
     print 'Creating launchers'
     for exe in executables:
-        path = os.path.join(FREEZE_DIR, exe) 
+        path = os.path.join(FREEZE_DIR, exe)
         open(path, 'wb').write(textwrap.dedent('''\
         #!/bin/sh
         export CALIBRE_CX_EXE=%s
@@ -209,15 +210,15 @@ def freeze():
         $loader "$@"
         ''')%exe)
         os.chmod(path, 0755)
-    
+
     exes = list(executables.keys())
     exes.remove('calibre_postinstall')
     exes.remove('calibre-parallel')
     open(os.path.join(FREEZE_DIR, 'manifest'), 'wb').write('\n'.join(exes))
-            
+
     print 'Creating archive...'
     dist = open(os.path.join(DIST_DIR, 'calibre-%s-i686.tar.bz2'%__version__), 'wb')
-    with closing(tarfile.open(fileobj=dist, mode='w:bz2', 
+    with closing(tarfile.open(fileobj=dist, mode='w:bz2',
                               format=tarfile.PAX_FORMAT)) as tf:
         for f in walk(FREEZE_DIR):
             name = f.replace(FREEZE_DIR, '')[1:]
diff --git a/installer/osx/freeze.py b/installer/osx/freeze.py
index ff1684bb04..c1e458caf8 100644
--- a/installer/osx/freeze.py
+++ b/installer/osx/freeze.py
@@ -57,7 +57,7 @@ r'''
 def _check_symlinks_prescript():
     import os, tempfile, traceback, sys
     from Authorization import Authorization, kAuthorizationFlagDestroyRights
-    
+
     AUTHTOOL="""#!%(sp)s
 import os
 scripts = %(sp)s
@@ -71,13 +71,13 @@ for s, l in zip(scripts, links):
     os.symlink(s, l)
     os.umask(omask)
 """
-    
+
     dest_path = %(dest_path)s
     resources_path = os.environ['RESOURCEPATH']
-    scripts = %(scripts)s    
+    scripts = %(scripts)s
     links   = [os.path.join(dest_path, i) for i in scripts]
     scripts = [os.path.join(resources_path, 'loaders', i) for i in scripts]
-    
+
     bad = False
     for s, l in zip(scripts, links):
         if os.path.exists(l) and os.path.exists(os.path.realpath(l)):
@@ -111,22 +111,22 @@ _check_symlinks_prescript()
             packages=self.packages,
             excludes=self.excludes,
             debug=debug)
-        
+
     @classmethod
-    def makedmg(cls, d, volname, 
-                destdir='dist', 
+    def makedmg(cls, d, volname,
+                destdir='dist',
                 internet_enable=True,
                 format='UDBZ'):
         ''' Copy a directory d into a dmg named volname '''
         dmg = os.path.join(destdir, volname+'.dmg')
         if os.path.exists(dmg):
             os.unlink(dmg)
-        subprocess.check_call(['/usr/bin/hdiutil', 'create', '-srcfolder', os.path.abspath(d), 
+        subprocess.check_call(['/usr/bin/hdiutil', 'create', '-srcfolder', os.path.abspath(d),
                                '-volname', volname, '-format', format, dmg])
         if internet_enable:
            subprocess.check_call(['/usr/bin/hdiutil', 'internet-enable', '-yes', dmg])
         return dmg
-        
+
     @classmethod
     def qt_dependencies(cls, path):
         pipe = subprocess.Popen('/usr/bin/otool -L '+path, shell=True, stdout=subprocess.PIPE).stdout
@@ -134,12 +134,12 @@ _check_symlinks_prescript()
         for l in pipe.readlines():
             match = re.search(r'(.*)\(', l)
             if not match:
-                continue 
+                continue
             lib = match.group(1).strip()
             if lib.startswith(BuildAPP.QT_PREFIX):
                 deps.append(lib)
         return deps
-    
+
     @classmethod
     def fix_qt_dependencies(cls, path, deps):
         fp = '@executable_path/../Frameworks/'
@@ -155,8 +155,8 @@ _check_symlinks_prescript()
             newpath = fp + '%s.framework/Versions/Current/%s'%(module, module)
             cmd = ' '.join(['/usr/bin/install_name_tool', '-change', dep, newpath, path])
             subprocess.check_call(cmd, shell=True)
-        
-    
+
+
     def add_qt_plugins(self):
         macos_dir = os.path.join(self.dist_dir, APPNAME + '.app', 'Contents', 'MacOS')
         for root, dirs, files in os.walk(BuildAPP.QT_PREFIX+'/plugins'):
@@ -172,14 +172,14 @@ _check_symlinks_prescript()
                     shutil.copymode(path, target)
                     deps = BuildAPP.qt_dependencies(target)
                     BuildAPP.fix_qt_dependencies(target, deps)
-                                            
-            
+
+
         #deps = BuildAPP.qt_dependencies(path)
-    
+
     def fix_python_dependencies(self, files):
         for f in files:
             subprocess.check_call(['/usr/bin/install_name_tool', '-change', '/Library/Frameworks/Python.framework/Versions/2.6/Python', '@executable_path/../Frameworks/Python.framework/Versions/2.6/Python', f])
-            
+
     def fix_misc_dependencies(self, files):
         for path in files:
             frameworks_dir = os.path.join(self.dist_dir, APPNAME + '.app', 'Contents', 'Frameworks')
@@ -195,15 +195,15 @@ _check_symlinks_prescript()
                     if os.path.exists(bundle):
                         subprocess.check_call(['/usr/bin/install_name_tool', '-change', dep,
                                 '@executable_path/../Frameworks/'+name, path])
-                    
-    
+
+
     def add_plugins(self):
         self.add_qt_plugins()
         frameworks_dir = os.path.join(self.dist_dir, APPNAME + '.app', 'Contents', 'Frameworks')
         plugins_dir = os.path.join(frameworks_dir, 'plugins')
         if not os.path.exists(plugins_dir):
             os.mkdir(plugins_dir)
-        
+
         maps = {}
         for f in glob.glob('src/calibre/plugins/*'):
             tgt = plugins_dir
@@ -217,8 +217,8 @@ _check_symlinks_prescript()
             deps.append(dst)
         self.fix_python_dependencies(deps)
         self.fix_misc_dependencies(deps)
-        
-    
+
+
     def run(self):
         py2app.run(self)
         resource_dir = os.path.join(self.dist_dir,
@@ -242,8 +242,8 @@ _check_symlinks_prescript()
             os.chmod(path, stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH|stat.S_IREAD\
                      |stat.S_IWUSR|stat.S_IROTH|stat.S_IRGRP)
         self.add_plugins()
-        
-            
+
+
         print
         print 'Adding pdftohtml'
         os.link(os.path.expanduser('~/pdftohtml'), os.path.join(frameworks_dir, 'pdftohtml'))
@@ -259,21 +259,21 @@ _check_symlinks_prescript()
         if os.path.exists(dst):
             shutil.rmtree(dst)
         shutil.copytree('/usr/local/etc/fonts', dst, symlinks=False)
-        
+
         print
         print 'Adding IPython'
         dst = os.path.join(resource_dir, 'lib', 'python2.6', 'IPython')
         if os.path.exists(dst): shutil.rmtree(dst)
         shutil.copytree(os.path.expanduser('~/build/ipython/IPython'), dst)
-        
-        print 
+
+        print
         print 'Adding ImageMagick'
         dest = os.path.join(frameworks_dir, 'ImageMagick')
         if os.path.exists(dest):
-            sutil.rmtree(dest)
+            shutil.rmtree(dest)
         shutil.copytree(os.path.expanduser('~/ImageMagick'), dest, True)
         shutil.copyfile('/usr/local/lib/libpng12.0.dylib', os.path.join(dest, 'lib', 'libpng12.0.dylib'))
-        
+
         print
         print 'Installing prescipt'
         sf = [os.path.basename(s) for s in all_names]
@@ -293,13 +293,13 @@ sys.frameworks_dir = os.path.join(os.path.dirname(os.environ['RESOURCEPATH']), '
         print >>f, 'import sys, os'
         f.write(src)
         f.close()
-        print 
+        print
         print 'Adding main scripts to site-packages'
         f = zipfile.ZipFile(os.path.join(self.dist_dir, APPNAME+'.app', 'Contents', 'Resources', 'lib', 'python'+sys.version[:3], 'site-packages.zip'), 'a', zipfile.ZIP_DEFLATED)
         for script in scripts['gui']+scripts['console']:
             f.write(script, script.partition('/')[-1])
         f.close()
-        print 
+        print
         print 'Creating console.app'
         contents_dir = os.path.dirname(resource_dir)
         cc_dir = os.path.join(contents_dir, 'console.app', 'Contents')
@@ -312,7 +312,7 @@ sys.frameworks_dir = os.path.join(os.path.dirname(os.environ['RESOURCEPATH']), '
                 plist['LSUIElement'] = '1'
                 plistlib.writePlist(plist, os.path.join(cc_dir, x))
             else:
-                os.symlink(os.path.join('../..', x), 
+                os.symlink(os.path.join('../..', x),
                            os.path.join(cc_dir, x))
         print
         print 'Building disk image'
@@ -343,9 +343,10 @@ def main():
                                        'calibre.ebooks.lrf.any.*', 'calibre.ebooks.lrf.feeds.*',
                                        'keyword', 'codeop', 'pydoc', 'readline',
                                        'BeautifulSoup', 'calibre.ebooks.lrf.fonts.prs500.*',
-                                       'dateutil',
+                                       'dateutil', 'email.iterators',
+                                       'email.generator',
                                        ],
-                         'packages' : ['PIL', 'Authorization', 'lxml'],
+                         'packages' : ['PIL', 'Authorization', 'lxml', 'dns'],
                          'excludes' : ['IPython'],
                          'plist'    : { 'CFBundleGetInfoString' : '''calibre, an E-book management application.'''
                                         ''' Visit http://calibre.kovidgoyal.net for details.''',
diff --git a/installer/windows/calibre/calibre.mpi b/installer/windows/calibre/calibre.mpi
index ee7ab53455..8073c45f29 100644
--- a/installer/windows/calibre/calibre.mpi
+++ b/installer/windows/calibre/calibre.mpi
@@ -273,7 +273,6 @@ File ::C49805D2-C0B8-01C4-DF6F-674D9C0BFD15 -name IM_MOD_RL_viff_.dll -parent 8E
 File ::1B9F2F00-20A5-B207-5A80-8F75470286AD -name txt2lrf.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::826F1915-9F97-59DD-6637-3EEC0744A79C -name IM_MOD_RL_ps2_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::519A6618-8A1F-93A5-93B4-6EEF5A4A3DE9 -name comic2pdf.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B0CEAA35-52BF-0DE0-BAC7-7B23157E29BD -name isbndb.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::A5F23791-BCDC-A997-4941-5D1F2F227E6D -name type.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::0A1C107A-C0AA-3ED6-4F37-A6894386DCBE -name IM_MOD_RL_ps3_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::EEBA64E7-6509-EBAF-3E23-1A203216F39A -name epub2lrf.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
@@ -284,7 +283,6 @@ File ::EA37C1C2-57BB-4E7A-C004-0010D79142C2 -name IM_MOD_RL_fits_.dll -parent 8E
 File ::05F5C10D-6988-F1F4-A486-86C96DB20302 -name pywintypes26.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::0137A2B1-EB94-EB26-7295-0C7CD941A1DF -name IM_MOD_RL_histogram_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::7F199A1F-4FA4-2ABA-DED3-36ECF3C089CA -name epub2lrf.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F9F112C9-B61B-E041-1A9D-47641B047135 -name isbndb.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::CF6398D8-2140-53CF-1DA6-421A82E92621 -name any2epub.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::8DFA6C69-360D-FA63-7FF9-860E3DB00B19 -name any2lrf.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::5BB7579D-9183-412C-81F8-B411B07C57B3 -name IM_MOD_RL_pnm_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
@@ -544,6 +542,8 @@ File ::325F545D-30A8-08DA-74F0-AC1244F6C1D9 -name IM_MOD_RL_vid_.dll -parent 8E5
 File ::24238371-77D0-0A8F-35D1-498A5FCC1B0D -name IM_MOD_RL_rla_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::6F5D62F3-5E63-0753-364C-01CAAF1002E0 -name IM_MOD_RL_magick_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 File ::9FDAC308-5D4F-A865-A09A-9FBF48162A47 -name IM_MOD_RL_djvu_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
+File ::5D748040-5973-EFF1-41FC-B424636C642E -name fetch-ebook-metadata.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
+File ::8B8655B8-3823-AA02-1CDA-02F5AD4677C0 -name fetch-ebook-metadata.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
 Component ::F6829AB7-9F66-4CEE-CA0E-21F54C6D3609 -setup Install -active Yes -platforms {AIX-ppc FreeBSD-4-x86 FreeBSD-x86 HPUX-hppa Linux-x86 Solaris-sparc Windows} -name Main -parent Components
 SetupType ::D9ADE41C-B744-690C-2CED-CF826BF03D2E -setup Install -active Yes -platforms {AIX-ppc FreeBSD-4-x86 FreeBSD-x86 HPUX-hppa Linux-x86 Solaris-sparc Windows} -name Typical -parent SetupTypes
 
diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py
index fce5a2c923..aca1481fa8 100644
--- a/installer/windows/freeze.py
+++ b/installer/windows/freeze.py
@@ -14,12 +14,11 @@ IMAGEMAGICK_DIR  = 'C:\\ImageMagick'
 FONTCONFIG_DIR   = 'C:\\fontconfig'
 VC90             = r'C:\VC90.CRT'
 
-import sys, os, py2exe, shutil, zipfile, glob, subprocess, re
+import sys, os, py2exe, shutil, zipfile, glob, re
 from distutils.core import setup
-from distutils.filelist import FileList
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 sys.path.insert(0, BASE_DIR)
-from setup import VERSION, APPNAME, entry_points, scripts, basenames
+from setup import VERSION, APPNAME, scripts, basenames
 sys.path.remove(BASE_DIR)
 
 ICONS = [os.path.abspath(os.path.join(BASE_DIR, 'icons', i)) for i in ('library.ico', 'viewer.ico')]
@@ -33,7 +32,7 @@ WINVER = VERSION+'.0'
 PY2EXE_DIR = os.path.join(BASE_DIR, 'build','py2exe')
 
 class BuildEXE(py2exe.build_exe.py2exe):
-    
+
     def run(self):
         py2exe.build_exe.py2exe.run(self)
         print 'Adding plugins...'
@@ -61,19 +60,19 @@ class BuildEXE(py2exe.build_exe.py2exe):
             if os.path.exists(tg):
                 shutil.rmtree(tg)
             shutil.copytree(imfd, tg)
-            
-        print 
+
+        print
         print 'Adding main scripts'
         f = zipfile.ZipFile(os.path.join(PY2EXE_DIR, 'library.zip'), 'a', zipfile.ZIP_DEFLATED)
         for i in scripts['console'] + scripts['gui']:
             f.write(i, i.partition('\\')[-1])
         f.close()
-        
+
         print
         print 'Copying icons'
         for icon in ICONS:
             shutil.copyfile(icon, os.path.join(PY2EXE_DIR, os.path.basename(icon)))
-        
+
         print
         print 'Adding third party dependencies'
         print '\tAdding devcon'
@@ -96,18 +95,18 @@ class BuildEXE(py2exe.build_exe.py2exe):
                 shutil.copytree(f, tgt)
             else:
                 shutil.copyfile(f, tgt)
-                
-        print 
+
+        print
         print 'Doing DLL redirection' # See http://msdn.microsoft.com/en-us/library/ms682600(VS.85).aspx
         for f in glob.glob(os.path.join(PY2EXE_DIR, '*.exe')):
             open(f + '.local', 'w').write('\n')
-        
+
         print
         print 'Adding Windows runtime dependencies...'
         for f in glob.glob(os.path.join(VC90, '*')):
             shutil.copyfile(f, os.path.join(PY2EXE_DIR, os.path.basename(f)))
-        
-    
+
+
 def exe_factory(dest_base, script, icon_resources=None):
     exe = {
            'dest_base'       : dest_base,
@@ -144,7 +143,9 @@ def main(args=sys.argv):
                                   'includes'  : [
                                              'sip', 'pkg_resources', 'PyQt4.QtSvg',
                                              'mechanize', 'ClientForm', 'wmi',
-                                             'win32file', 'pythoncom', 
+                                             'win32file', 'pythoncom',
+                                             'email.iterators',
+                                             'email.generator',
                                              'win32process', 'win32api', 'msvcrt',
                                              'win32event', 'calibre.ebooks.lrf.any.*',
                                              'calibre.ebooks.lrf.feeds.*',
@@ -155,14 +156,14 @@ def main(args=sys.argv):
                                              'PyQt4.QtWebKit', 'PyQt4.QtNetwork',
                                              ],
                                   'packages'  : ['PIL', 'lxml', 'cherrypy',
-                                                 'dateutil'],
+                                                 'dateutil', 'dns'],
                                   'excludes'  : ["Tkconstants", "Tkinter", "tcl",
                                                  "_imagingtk", "ImageTk", "FixTk"
                                                 ],
                                   'dll_excludes' : ['mswsock.dll'],
                                  },
                     },
-          
+
           )
     return 0
 
diff --git a/session.vim b/session.vim
new file mode 100644
index 0000000000..454b468ae0
--- /dev/null
+++ b/session.vim
@@ -0,0 +1,16 @@
+" Project wide builtins
+let g:pyflakes_builtins += ["dynamic_property", '__']
+
+python << EOFPY
+import os
+
+import vipy
+
+source_file = vipy.vipy.eval('expand("<sfile>")')
+project_dir = os.path.dirname(source_file)
+src_dir = os.path.abspath(os.path.join(project_dir, 'src'))
+base_dir = os.path.join(src_dir, 'calibre')
+
+vipy.session.initialize(project_name='calibre', src_dir=src_dir,
+            project_dir=project_dir, base_dir=base_dir)
+EOFPY
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index c844184fe0..817452d558 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.5.2'
+__version__   = '0.5.3'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 '''
 Various run time constants.
diff --git a/src/calibre/customize/conversion.py b/src/calibre/customize/conversion.py
index a77e32beee..3ebabc4d52 100644
--- a/src/calibre/customize/conversion.py
+++ b/src/calibre/customize/conversion.py
@@ -1,33 +1,31 @@
 from __future__ import with_statement
 '''
-Defines the plugin sytem for conversions.
+Defines the plugin system for conversions.
 '''
 import re, os, shutil
 
-from lxml import html
-
 from calibre import CurrentDir
 from calibre.customize import Plugin
 
 class ConversionOption(object):
-    
+
     '''
     Class representing conversion options
     '''
-    
-    def __init__(self, name=None, help=None, long_switch=None, 
+
+    def __init__(self, name=None, help=None, long_switch=None,
                  short_switch=None, choices=None):
         self.name = name
         self.help = help
         self.long_switch = long_switch
         self.short_switch = short_switch
         self.choices = choices
-        
+
         if self.long_switch is None:
             self.long_switch = self.name.replace('_', '-')
-        
+
         self.validate_parameters()
-        
+
     def validate_parameters(self):
         '''
         Validate the parameters passed to :method:`__init__`.
@@ -36,21 +34,21 @@ class ConversionOption(object):
             raise ValueError(self.name + ' is not a valid Python identifier')
         if not self.help:
             raise ValueError('You must set the help text')
-        
+
     def __hash__(self):
         return hash(self.name)
-    
+
     def __eq__(self, other):
         return hash(self) == hash(other)
-        
+
 class OptionRecommendation(object):
     LOW  = 1
     MED  = 2
     HIGH = 3
-    
+
     def __init__(self, recommended_value=None, level=LOW, **kwargs):
         '''
-        An option recommendation. That is, an option as well as its recommended 
+        An option recommendation. That is, an option as well as its recommended
         value and the level of the recommendation.
         '''
         self.level = level
@@ -58,9 +56,9 @@ class OptionRecommendation(object):
         self.option = kwargs.pop('option', None)
         if self.option is None:
             self.option = ConversionOption(**kwargs)
-            
+
         self.validate_parameters()
-    
+
     def validate_parameters(self):
         if self.option.choices and self.recommended_value not in \
                                                     self.option.choices:
@@ -68,30 +66,30 @@ class OptionRecommendation(object):
                              self.option.name)
         if not (isinstance(self.recommended_value, (int, float, str, unicode))\
             or self.recommended_value is None):
-            raise ValueError('OpRec: %s:'%self.option.name + 
-                             repr(self.recommended_value) + 
+            raise ValueError('OpRec: %s:'%self.option.name +
+                             repr(self.recommended_value) +
                              ' is not a string or a number')
-         
+
 
 class InputFormatPlugin(Plugin):
     '''
-    InputFormatPlugins are responsible for converting a document into 
+    InputFormatPlugins are responsible for converting a document into
     HTML+OPF+CSS+etc.
     The results of the conversion *must* be encoded in UTF-8.
     The main action happens in :method:`convert`.
     '''
-    
+
     type = _('Conversion Input')
     can_be_disabled = False
     supported_platforms = ['windows', 'osx', 'linux']
-    
+
     #: Set of file types for which this plugin should be run
     #: For example: ``set(['azw', 'mobi', 'prc'])``
     file_types     = set([])
-    
+
     #: Options shared by all Input format plugins. Do not override
     #: in sub-classes. Use :member:`options` instead. Every option must be an
-    #: instance of :class:`OptionRecommendation`. 
+    #: instance of :class:`OptionRecommendation`.
     common_options = set([
         OptionRecommendation(name='debug_input',
             recommended_value=None, level=OptionRecommendation.LOW,
@@ -101,7 +99,7 @@ class InputFormatPlugin(Plugin):
                    'WARNING: This completely deletes the contents of '
                    'the specified directory.')
         ),
-        
+
         OptionRecommendation(name='input_encoding',
             recommended_value=None, level=OptionRecommendation.LOW,
             help=_('Specify the character encoding of the input document. If '
@@ -110,99 +108,70 @@ class InputFormatPlugin(Plugin):
                    'do not declare an encoding or that have erroneous '
                    'encoding declarations.')
         ),
-        
+
     ])
-    
+
     #: Options to customize the behavior of this plugin. Every option must be an
-    #: instance of :class:`OptionRecommendation`.  
+    #: instance of :class:`OptionRecommendation`.
     options = set([])
-    
-    #: A set of 3-tuples of the form 
+
+    #: A set of 3-tuples of the form
     #: (option_name, recommended_value, recommendation_level)
     recommendations = set([])
-    
-    def convert(self, stream, options, file_ext, parse_cache, log, accelerators):
+
+    def convert(self, stream, options, file_ext, log, accelerators):
         '''
         This method must be implemented in sub-classes. It must return
-        the path to the created OPF file. All output should be contained in 
+        the path to the created OPF file. All output should be contained in
         the current directory. If this plugin creates files outside the current
-        directory they must be deleted/marked for deletion before this method 
+        directory they must be deleted/marked for deletion before this method
         returns.
-        
+
         :param stream:   A file like object that contains the input file.
-        
-        :param options:  Options to customize the conversion process. 
+
+        :param options:  Options to customize the conversion process.
                          Guaranteed to have attributes corresponding
-                         to all the options declared by this plugin. In 
+                         to all the options declared by this plugin. In
                          addition, it will have a verbose attribute that
                          takes integral values from zero upwards. Higher numbers
-                         mean be more verbose. Another useful attribute is 
-                         ``input_profile`` that is an instance of 
+                         mean be more verbose. Another useful attribute is
+                         ``input_profile`` that is an instance of
                          :class:`calibre.customize.profiles.InputProfile`.
-                         
+
         :param file_ext: The extension (without the .) of the input file. It
                          is guaranteed to be one of the `file_types` supported
                          by this plugin.
-        
-        :param parse_cache:    A dictionary that maps absolute file paths to
-                               parsed representations of their contents. For
-                               HTML the representation is an lxml element of 
-                               the root of the tree. For CSS it is a cssutils
-                               stylesheet. If this plugin parses any of the
-                               output files, it should add them to the cache
-                               so that later stages of the conversion wont
-                               have to re-parse them. If a parsed representation
-                               is in the cache, there is no need to actually 
-                               write the file to disk.
-        
-        :param log: A :class:`calibre.utils.logging.Log` object. All output 
+
+        :param log: A :class:`calibre.utils.logging.Log` object. All output
                     should use this object.
-                    
+
         :param accelarators: A dictionary of various information that the input
                              plugin can get easily that would speed up the
                              subsequent stages of the conversion.
-                             
+
         '''
         raise NotImplementedError
-    
-    def __call__(self, stream, options, file_ext, parse_cache, log, 
+
+    def __call__(self, stream, options, file_ext, log,
                  accelerators, output_dir):
         log('InputFormatPlugin: %s running'%self.name, end=' ')
         if hasattr(stream, 'name'):
             log('on', stream.name)
-        
+
         with CurrentDir(output_dir):
             for x in os.listdir('.'):
                 shutil.rmtree(x) if os.path.isdir(x) else os.remove(x)
-                    
-                    
-            ret = self.convert(stream, options, file_ext, parse_cache, 
+
+
+            ret = self.convert(stream, options, file_ext,
                                log, accelerators)
-            for key in list(parse_cache.keys()):
-                if os.path.abspath(key) != key:
-                    log.warn(('InputFormatPlugin: %s returned a '
-                             'relative path: %s')%(self.name, key)
-                             )
-                    parse_cache[os.path.abspath(key)] = parse_cache.pop(key)
-                    
         if options.debug_input is not None:
             options.debug_input = os.path.abspath(options.debug_input)
             if not os.path.exists(options.debug_input):
                 os.makedirs(options.debug_input)
             shutil.rmtree(options.debug_input)
-            for f, obj in parse_cache.items():
-                if hasattr(obj, 'cssText'):
-                    raw = obj.cssText
-                else:
-                    raw = html.tostring(obj, encoding='utf-8', method='xml', 
-                         include_meta_content_type=True, pretty_print=True)
-                if isinstance(raw, unicode):
-                    raw = raw.encode('utf-8')
-                open(f, 'wb').write(raw)
             shutil.copytree('.', options.debug_input)
-                
-            
-                    
+
         return ret
 
 
@@ -210,32 +179,32 @@ class OutputFormatPlugin(Plugin):
     '''
     OutputFormatPlugins are responsible for converting an OEB document
     (OPF+HTML) into an output ebook.
-    
+
     The OEB document can be assumed to be encoded in UTF-8.
     The main action happens in :method:`convert`.
     '''
-    
+
     type = _('Conversion Output')
     can_be_disabled = False
     supported_platforms = ['windows', 'osx', 'linux']
-    
+
     #: The file type (extension without leading period) that this
     #: plugin outputs
     file_type     = None
-    
+
     #: Options shared by all Input format plugins. Do not override
     #: in sub-classes. Use :member:`options` instead. Every option must be an
-    #: instance of :class:`OptionRecommendation`. 
+    #: instance of :class:`OptionRecommendation`.
     common_options = set([])
-    
+
     #: Options to customize the behavior of this plugin. Every option must be an
-    #: instance of :class:`OptionRecommendation`.  
+    #: instance of :class:`OptionRecommendation`.
     options = set([])
-    
-    #: A set of 3-tuples of the form 
+
+    #: A set of 3-tuples of the form
     #: (option_name, recommended_value, recommendation_level)
     recommendations = set([])
 
-    def convert(self, oeb_book, input_plugin, options, parse_cache, log):
+    def convert(self, oeb_book, input_plugin, options, context, log):
         raise NotImplementedError
- 
+
diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py
index a3a7e22298..5e1ff297bb 100644
--- a/src/calibre/customize/profiles.py
+++ b/src/calibre/customize/profiles.py
@@ -4,56 +4,221 @@ __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import sys, re
-from calibre.customize import Plugin
+from itertools import izip
+
+from calibre.customize import Plugin as _Plugin
+
+FONT_SIZES = [('xx-small', 1),
+              ('x-small',  None),
+              ('small',    2),
+              ('medium',   3),
+              ('large',    4),
+              ('x-large',  5),
+              ('xx-large', 6),
+              (None,       7)]
+
+
+class Plugin(_Plugin):
+
+    fbase  = 12
+    fsizes = [5, 7, 9, 12, 13.5, 17, 20, 22, 24]
+    screen_size = (800, 600)
+    dpi = 100
+
+    def initialize(self):
+        self.width, self.height = self.screen_size
+        fsizes = list(self.fsizes)
+        self.fsizes = []
+        for (name, num), size in izip(FONT_SIZES, fsizes):
+            self.fsizes.append((name, num, float(size)))
+        self.fnames = dict((name, sz) for name, _, sz in self.fsizes if name)
+        self.fnums = dict((num, sz) for _, num, sz in self.fsizes if num)
+
 
 class InputProfile(Plugin):
-    
+
     author = 'Kovid Goyal'
     supported_platforms = set(['windows', 'osx', 'linux'])
     can_be_disabled = False
     type = _('Input profile')
 
-# TODO: Add some real information to this profile. All other profiles must
-#       inherit from this profile and override as needed
-
     name        = 'Default Input Profile'
     short_name  = 'default' # Used in the CLI so dont use spaces etc. in it
     description = _('This profile tries to provide sane defaults and is useful '
                     'if you know nothing about the input document.')
-                  
-input_profiles = [InputProfile]
-    
+
+
+class SonyReaderInput(InputProfile):
+
+    name        = 'Sony Reader'
+    short_name  = 'sony'
+    description = _('This profile is intended for the SONY PRS line. '
+                    'The 500/505/700 etc.')
+
+    screen_size               = (584, 754)
+    dpi                       = 168.451
+    fbase                     = 12
+    fsizes                    = [7.5, 9, 10, 12, 15.5, 20, 22, 24]
+
+
+class MSReaderInput(InputProfile):
+
+    name        = 'Microsoft Reader'
+    short_name  = 'msreader'
+    description = _('This profile is intended for the Microsoft Reader.')
+
+    screen_size               = (480, 652)
+    dpi                       = 96
+    fbase                     = 13
+    fsizes                    = [10, 11, 13, 16, 18, 20, 22, 26]
+
+class MobipocketInput(InputProfile):
+
+    name        = 'Mobipocket Books'
+    short_name  = 'mobipocket'
+    description = _('This profile is intended for the Mobipocket books.')
+
+    # Unfortunately MOBI books are not narrowly targeted, so this information is
+    # quite likely to be spurious
+    screen_size               = (600, 800)
+    dpi                       = 96
+    fbase                     = 18
+    fsizes                    = [14, 14, 16, 18, 20, 22, 24, 26]
+
+class HanlinV3Input(InputProfile):
+
+    name        = 'Hanlin V3'
+    short_name  = 'hanlinv3'
+    description = _('This profile is intended for the Hanlin V3 and its clones.')
+
+    # Screen size is a best guess
+    screen_size               = (584, 754)
+    dpi                       = 168.451
+    fbase                     = 16
+    fsizes                    = [12, 12, 14, 16, 18, 20, 22, 24]
+
+class CybookG3Input(InputProfile):
+
+    name        = 'Cybook G3'
+    short_name  = 'cybookg3'
+    description = _('This profile is intended for the Cybook G3.')
+
+    # Screen size is a best guess
+    screen_size               = (600, 800)
+    dpi                       = 168.451
+    fbase                     = 16
+    fsizes                    = [12, 12, 14, 16, 18, 20, 22, 24]
+
+class KindleInput(InputProfile):
+
+    name        = 'Kindle'
+    short_name  = 'kindle'
+    description = _('This profile is intended for the Amazon Kindle.')
+
+    # Screen size is a best guess
+    screen_size               = (525, 640)
+    dpi                       = 168.451
+    fbase                     = 16
+    fsizes                    = [12, 12, 14, 16, 18, 20, 22, 24]
+
+
+input_profiles = [InputProfile, SonyReaderInput, MSReaderInput,
+        MobipocketInput, HanlinV3Input, CybookG3Input, KindleInput]
+
 
 class OutputProfile(Plugin):
-    
+
     author = 'Kovid Goyal'
     supported_platforms = set(['windows', 'osx', 'linux'])
     can_be_disabled = False
     type = _('Output profile')
-    
+
     name        = 'Default Output Profile'
     short_name  = 'default' # Used in the CLI so dont use spaces etc. in it
     description = _('This profile tries to provide sane defaults and is useful '
                     'if you want to produce a document intended to be read at a '
                     'computer or on a range of devices.')
-    
-    epub_flow_size            = sys.maxint
-    screen_size               = None
-    remove_special_chars      = False
-    remove_object_tags        = False
-    
-class SonyReader(OutputProfile):
-    
+
+    # ADE dies an agonizing, long drawn out death if HTML files have more
+    # bytes than this.
+    flow_size                 = sys.maxint
+    # ADE runs screaming when it sees these characters
+    remove_special_chars      = re.compile(u'[\u200b\u00ad]')
+    # ADE falls to the ground in a dead faint when it sees an <object>
+    remove_object_tags        = True
+
+class SonyReaderOutput(OutputProfile):
+
     name        = 'Sony Reader'
     short_name  = 'sony'
     description = _('This profile is intended for the SONY PRS line. '
                     'The 500/505/700 etc.')
-     
-    epub_flow_size            = 270000
-    screen_size               = (590, 765)
-    remove_special_chars      = re.compile(u'[\u200b\u00ad]')
-    remove_object_tags        = True
-    
-    
-    
-output_profiles = [OutputProfile, SonyReader]
\ No newline at end of file
+
+    flow_size                 = 270000
+    screen_size               = (600, 775)
+    dpi                       = 168.451
+    fbase                     = 12
+    fsizes                    = [7.5, 9, 10, 12, 15.5, 20, 22, 24]
+
+class MSReaderOutput(OutputProfile):
+
+    name        = 'Microsoft Reader'
+    short_name  = 'msreader'
+    description = _('This profile is intended for the Microsoft Reader.')
+
+    screen_size               = (480, 652)
+    dpi                       = 96
+    fbase                     = 13
+    fsizes                    = [10, 11, 13, 16, 18, 20, 22, 26]
+
+class MobipocketOutput(OutputProfile):
+
+    name        = 'Mobipocket Books'
+    short_name  = 'mobipocket'
+    description = _('This profile is intended for the Mobipocket books.')
+
+    # Unfortunately MOBI books are not narrowly targeted, so this information is
+    # quite likely to be spurious
+    screen_size               = (600, 800)
+    dpi                       = 96
+    fbase                     = 18
+    fsizes                    = [14, 14, 16, 18, 20, 22, 24, 26]
+
+class HanlinV3Output(OutputProfile):
+
+    name        = 'Hanlin V3'
+    short_name  = 'hanlinv3'
+    description = _('This profile is intended for the Hanlin V3 and its clones.')
+
+    # Screen size is a best guess
+    screen_size               = (584, 754)
+    dpi                       = 168.451
+    fbase                     = 16
+    fsizes                    = [12, 12, 14, 16, 18, 20, 22, 24]
+
+class CybookG3Output(OutputProfile):
+
+    name        = 'Cybook G3'
+    short_name  = 'cybookg3'
+    description = _('This profile is intended for the Cybook G3.')
+
+    # Screen size is a best guess
+    screen_size               = (600, 800)
+    dpi                       = 168.451
+    fbase                     = 16
+    fsizes                    = [12, 12, 14, 16, 18, 20, 22, 24]
+
+class KindleOutput(OutputProfile):
+
+    name        = 'Kindle'
+    short_name  = 'kindle'
+    description = _('This profile is intended for the Amazon Kindle.')
+
+    # Screen size is a best guess
+    screen_size               = (525, 640)
+    dpi                       = 168.451
+    fbase                     = 16
+    fsizes                    = [12, 12, 14, 16, 18, 20, 22, 24]
+
+output_profiles = [OutputProfile, SonyReaderOutput, MSReaderOutput,
+        MobipocketOutput, HanlinV3Output, CybookG3Output, KindleOutput]
diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 962681a267..45ce9987e0 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -17,22 +17,25 @@ def option_parser():
 
 Run an embedded python interpreter.
 ''')
-    parser.add_option('--update-module', help='Update the specified module in the frozen library. '+
-    'Module specifications are of the form full.name.of.module,path_to_module.py', default=None
+    parser.add_option('--update-module',
+            help='Update the specified module in the frozen library. '+
+    'Module specifications are of the form full.name.of.module,path_to_module.py',
+    default=None
     )
     parser.add_option('-c', '--command', help='Run python code.', default=None)
     parser.add_option('-e', '--exec-file', default=None, help='Run the python code in file.')
-    parser.add_option('-d', '--debug-device-driver', default=False, action='store_true', 
+    parser.add_option('-d', '--debug-device-driver', default=False, action='store_true',
                       help='Debug the specified device driver.')
     parser.add_option('-g', '--gui',  default=False, action='store_true',
                       help='Run the GUI',)
-    parser.add_option('--migrate', action='store_true', default=False, 
-                      help='Migrate old database. Needs two arguments. Path to library1.db and path to new library folder.')
+    parser.add_option('--migrate', action='store_true', default=False,
+                      help='Migrate old database. Needs two arguments. Path '
+                           'to library1.db and path to new library folder.')
     return parser
 
 def update_zipfile(zipfile, mod, path):
     if 'win32' in sys.platform:
-        print 'WARNING: On Windows Vista using this option may cause windows to put library.zip into the Virtual Store (typically located in c:\Users\username\AppData\Local\VirtualStore). If it does this you must delete it from there after you\'re done debugging).' 
+        print 'WARNING: On Windows Vista using this option may cause windows to put library.zip into the Virtual Store (typically located in c:\Users\username\AppData\Local\VirtualStore). If it does this you must delete it from there after you\'re done debugging).'
     pat = re.compile(mod.replace('.', '/')+r'\.py[co]*')
     name = mod.replace('.', '/') + os.path.splitext(path)[-1]
     update(zipfile, [pat], [path], [name])
@@ -46,8 +49,8 @@ def update_module(mod, path):
         zp = os.path.join(os.path.dirname(sys.executable), 'library.zip')
     elif isosx:
         zp = os.path.join(os.path.dirname(getattr(sys, 'frameworks_dir')),
-                            'Resources', 'lib', 
-                            'python'+'.'.join(map(str, sys.version_info[:2])), 
+                            'Resources', 'lib',
+                            'python'+'.'.join(map(str, sys.version_info[:2])),
                             'site-packages.zip')
     else:
         zp = os.path.join(getattr(sys, 'frozen_path'), 'loader.zip')
@@ -71,23 +74,23 @@ def migrate(old, new):
             self.max = max
         def setValue(self, val):
             self.update(float(val)/getattr(self, 'max', 1))
-            
+
     db = LibraryDatabase(old)
     db2 = LibraryDatabase2(new)
     db2.migrate_old(db, Dummy(terminal_controller, 'Migrating database...'))
     prefs['library_path'] = os.path.abspath(new)
     print 'Database migrated to', os.path.abspath(new)
-    
+
 def debug_device_driver():
     from calibre.devices.scanner import DeviceScanner
     s = DeviceScanner()
     s.scan()
     print 'USB devices on system:', repr(s.devices)
     if iswindows:
-        wmi = __import__('wmi', globals(), locals(), [], -1) 
+        wmi = __import__('wmi', globals(), locals(), [], -1)
         drives = []
         print 'Drives detected:'
-        print '\t', '(ID, Partitions, Drive letter)' 
+        print '\t', '(ID, Partitions, Drive letter)'
         for drive in wmi.WMI().Win32_DiskDrive():
             if drive.Partitions == 0:
                 continue
@@ -111,7 +114,7 @@ def debug_device_driver():
             d.open()
             print 'Total space:', d.total_space()
             break
-        
+
 
 def main(args=sys.argv):
     opts, args = option_parser().parse_args(args)
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index 14b056944b..a5775dec8a 100755
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -4,32 +4,32 @@ __copyright__ = '2009, John Schember <john at nachtimwald.com>'
 Device driver for Amazon's Kindle
 '''
 
-import os, re
+import os, re, sys
 
 from calibre.devices.usbms.driver import USBMS, metadata_from_formats
 
 class KINDLE(USBMS):
     # Ordered list of supported formats
     FORMATS     = ['azw', 'mobi', 'prc', 'azw1', 'tpz', 'txt']
-    
+
     VENDOR_ID   = [0x1949]
     PRODUCT_ID  = [0x0001]
     BCD         = [0x399]
-    
+
     VENDOR_NAME = 'KINDLE'
     WINDOWS_MAIN_MEM = 'INTERNAL_STORAGE'
     WINDOWS_CARD_MEM = 'CARD_STORAGE'
-    
+
     OSX_MAIN_MEM = 'Kindle Internal Storage Media'
     OSX_CARD_MEM = 'Kindle Card Storage Media'
-    
+
     MAIN_MEMORY_VOLUME_LABEL  = 'Kindle Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'Kindle Storage Card'
-    
+
     EBOOK_DIR_MAIN = "documents"
     EBOOK_DIR_CARD = "documents"
     SUPPORTS_SUB_DIRS = True
-    
+
     WIRELESS_FILE_NAME_PATTERN = re.compile(
     r'(?P<title>[^-]+)-asin_(?P<asin>[a-zA-Z\d]{10,})-type_(?P<type>\w{4})-v_(?P<index>\d+).*')
 
@@ -37,13 +37,13 @@ class KINDLE(USBMS):
         for path in paths:
             if os.path.exists(path):
                 os.unlink(path)
-                
+
                 filepath = os.path.splitext(path)[0]
-                
+
                 # Delete the ebook auxiliary file
                 if os.path.exists(filepath + '.mbp'):
                     os.unlink(filepath + '.mbp')
-                    
+
     @classmethod
     def metadata_from_path(cls, path):
         mi = metadata_from_formats([path])
@@ -51,10 +51,13 @@ class KINDLE(USBMS):
             match = cls.WIRELESS_FILE_NAME_PATTERN.match(os.path.basename(path))
             if match is not None:
                 mi.title = match.group('title')
+                if not isinstance(mi.title, unicode):
+                    mi.title = mi.title.decode(sys.getfilesystemencoding(),
+                                               'replace')
         return mi
 
 
 class KINDLE2(KINDLE):
-    
+
     PRODUCT_ID = [0x0002]
-    BCD        = [0x0100]
\ No newline at end of file
+    BCD        = [0x0100]
diff --git a/src/calibre/devices/prs500/driver.py b/src/calibre/devices/prs500/driver.py
index 2f1caaee9d..a905a314ae 100755
--- a/src/calibre/devices/prs500/driver.py
+++ b/src/calibre/devices/prs500/driver.py
@@ -22,17 +22,17 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 ###          Usage Type               Data
 ###        wMaxPacketSize     0x0040  1x 64 bytes
 ###        bInterval               0
-### 
 ###
-### Endpoint 0x81 is device->host and endpoint 0x02 is host->device. 
+###
+### Endpoint 0x81 is device->host and endpoint 0x02 is host->device.
 ### You can establish Stream pipes to/from these endpoints for Bulk transfers.
-### Has two configurations 1 is the USB charging config 2 is the self-powered 
+### Has two configurations 1 is the USB charging config 2 is the self-powered
 ### config. I think config management is automatic. Endpoints are the same
 """
 Contains the logic for communication with the device (a SONY PRS-500).
 
-The public interface of class L{PRS500} defines the 
-methods for performing various tasks. 
+The public interface of class L{PRS500} defines the
+methods for performing various tasks.
 """
 import sys, os
 from tempfile import TemporaryFile
@@ -49,12 +49,12 @@ from calibre.devices.prs500.books import BookList, fix_ids
 from calibre import __author__, __appname__
 
 # Protocol versions this driver has been tested with
-KNOWN_USB_PROTOCOL_VERSIONS = [0x3030303030303130L] 
+KNOWN_USB_PROTOCOL_VERSIONS = [0x3030303030303130L]
 
 
 class File(object):
-    """ 
-    Wrapper that allows easy access to all information about files/directories 
+    """
+    Wrapper that allows easy access to all information about files/directories
     """
     def __init__(self, _file):
         self.is_dir      = _file[1].is_dir      #: True if self is a directory
@@ -63,9 +63,9 @@ class File(object):
         self.ctime       = _file[1].ctime       #: Creation time of self as a epoch
         self.wtime       = _file[1].wtime       #: Creation time of self as an epoch
         path = _file[0]
-        if path.endswith("/"): 
+        if path.endswith("/"):
             path = path[:-1]
-        self.path = path                       #: Path to self  
+        self.path = path                       #: Path to self
         self.name = path[path.rfind("/")+1:].rstrip() #: Name of self
 
     def __repr__(self):
@@ -80,7 +80,7 @@ class PRS500(Device):
 
     """
     Implements the backend for communication with the SONY Reader.
-    Each method decorated by C{safe} performs a task.    
+    Each method decorated by C{safe} performs a task.
     """
 
     VENDOR_ID    = 0x054c #: SONY Vendor Id
@@ -92,33 +92,33 @@ class PRS500(Device):
     BULK_IN_EP   = 0x81   #: Endpoint for Bulk reads
     BULK_OUT_EP  = 0x02   #: Endpoint for Bulk writes
     # Location of media.xml file on device
-    MEDIA_XML  = "/Data/database/cache/media.xml"  
+    MEDIA_XML  = "/Data/database/cache/media.xml"
     # Location of cache.xml on storage card in device
-    CACHE_XML = "/Sony Reader/database/cache.xml" 
+    CACHE_XML = "/Sony Reader/database/cache.xml"
     # Ordered list of supported formats
-    FORMATS     = ["lrf", "lrx", "rtf", "pdf", "txt"]             
+    FORMATS     = ["lrf", "lrx", "rtf", "pdf", "txt"]
     # Height for thumbnails of books/images on the device
     THUMBNAIL_HEIGHT = 68
     # Directory on card to which books are copied
     CARD_PATH_PREFIX = __appname__
     _packet_number = 0     #: Keep track of the packet number for packet tracing
-    
+
     def log_packet(self, packet, header, stream=sys.stderr):
-        """ 
-        Log C{packet} to stream C{stream}. 
-        Header should be a small word describing the type of packet. 
-        """    
+        """
+        Log C{packet} to stream C{stream}.
+        Header should be a small word describing the type of packet.
+        """
         self._packet_number += 1
         print >> stream, str(self._packet_number), header, "Type:", \
                                    packet.__class__.__name__
         print >> stream, packet
         print >> stream, "--"
-        
+
     @classmethod
     def validate_response(cls, res, _type=0x00, number=0x00):
-        """ 
-        Raise a ProtocolError if the type and number of C{res} 
-        is not the same as C{type} and C{number}. 
+        """
+        Raise a ProtocolError if the type and number of C{res}
+        is not the same as C{type} and C{number}.
         """
         if _type != res.type or number != res.rnumber:
             raise ProtocolError("Inavlid response.\ntype: expected=" + \
@@ -127,31 +127,31 @@ class PRS500(Device):
                                        " actual="+hex(res.rnumber))
 
     @classmethod
-    def signature(cls):    
+    def signature(cls):
         """ Return a two element tuple (vendor id, product id) """
         return (cls.VENDOR_ID, cls.PRODUCT_ID )
 
     def safe(func):
-        """ 
-        Decorator that wraps a call to C{func} to ensure that 
-        exceptions are handled correctly. It also calls L{open} to claim 
+        """
+        Decorator that wraps a call to C{func} to ensure that
+        exceptions are handled correctly. It also calls L{open} to claim
         the interface and initialize the Reader if needed.
 
         As a convenience, C{safe} automatically sends the a
         L{EndSession} after calling func, unless func has
         a keyword argument named C{end_session} set to C{False}.
 
-        An L{ArgumentError} will cause the L{EndSession} command to 
+        An L{ArgumentError} will cause the L{EndSession} command to
         be sent to the device, unless end_session is set to C{False}.
-        An L{usb.USBError} will cause the library to release control of the 
+        An L{usb.USBError} will cause the library to release control of the
         USB interface via a call to L{close}.
         """
         @wraps(func)
         def run_session(*args, **kwargs):
-            dev = args[0]      
+            dev = args[0]
             res = None
             try:
-                if not dev.handle: 
+                if not dev.handle:
                     dev.open()
                 if not dev.in_session:
                     dev.send_validated_command(BeginEndSession(end=False))
@@ -161,19 +161,19 @@ class PRS500(Device):
                 if not kwargs.has_key("end_session") or kwargs["end_session"]:
                     dev.send_validated_command(BeginEndSession(end=True))
                     dev.in_session = False
-                raise 
+                raise
             except USBError, err:
                 if "No such device" in str(err):
                     raise DeviceError()
-                elif "Connection timed out" in str(err):           
+                elif "Connection timed out" in str(err):
                     dev.close()
                     raise TimeoutError(func.__name__)
-                elif "Protocol error" in str(err):    
+                elif "Protocol error" in str(err):
                     dev.close()
                     raise ProtocolError("There was an unknown error in the"+\
                                                  " protocol. Contact " + __author__)
                 dev.close()
-                raise 
+                raise
             if not kwargs.has_key("end_session") or kwargs["end_session"]:
                 dev.send_validated_command(BeginEndSession(end=True))
                 dev.in_session = False
@@ -182,15 +182,15 @@ class PRS500(Device):
         return run_session
 
     def __init__(self, key='-1', log_packets=False, report_progress=None) :
-        """ 
+        """
         @param key: The key to unlock the device
-        @param log_packets: If true the packet stream to/from the device is logged 
-        @param report_progress: Function that is called with a % progress 
+        @param log_packets: If true the packet stream to/from the device is logged
+        @param report_progress: Function that is called with a % progress
                                 (number between 0 and 100) for various tasks
-                                If it is called with -1 that means that the 
+                                If it is called with -1 that means that the
                                 task does not have any progress information
         """
-        self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID) 
+        self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID)
         # Handle that is used to communicate with device. Setup in L{open}
         self.handle = None
         self.in_session = False
@@ -204,14 +204,14 @@ class PRS500(Device):
 
     def reconnect(self):
         """ Only recreates the device node and deleted the connection handle """
-        self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID) 
+        self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID)
         self.handle = None
 
     @classmethod
     def is_connected(cls, helper=None):
-        """ 
-        This method checks to see whether the device is physically connected. 
-        It does not return any information about the validity of the 
+        """
+        This method checks to see whether the device is physically connected.
+        It does not return any information about the validity of the
         software connection. You may need to call L{reconnect} if you keep
         getting L{DeviceError}.
         """
@@ -222,15 +222,15 @@ class PRS500(Device):
 
     def set_progress_reporter(self, report_progress):
         self.report_progress = report_progress
-    
+
     def open(self) :
         """
-        Claim an interface on the device for communication. 
+        Claim an interface on the device for communication.
         Requires write privileges to the device file.
-        Also initialize the device. 
+        Also initialize the device.
         See the source code for the sequence of initialization commands.
         """
-        self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID)        
+        self.device = get_device_by_id(self.VENDOR_ID, self.PRODUCT_ID)
         if not self.device:
             raise DeviceError()
         configs = self.device.configurations
@@ -238,7 +238,7 @@ class PRS500(Device):
             self.handle = self.device.open()
             config = configs[0]
             try:
-                self.handle.set_configuration(configs[0])                
+                self.handle.set_configuration(configs[0])
             except USBError:
                 self.handle.set_configuration(configs[1])
                 config = configs[1]
@@ -250,13 +250,13 @@ class PRS500(Device):
             else:
                 red, wed = ed2, ed1
             self.bulk_read_max_packet_size = red.MaxPacketSize
-            self.bulk_write_max_packet_size = wed.MaxPacketSize            
+            self.bulk_write_max_packet_size = wed.MaxPacketSize
             self.handle.claim_interface(self.INTERFACE_ID)
         except USBError, err:
             raise DeviceBusy(str(err))
         # Large timeout as device may still be initializing
-        res = self.send_validated_command(GetUSBProtocolVersion(), timeout=20000) 
-        if res.code != 0: 
+        res = self.send_validated_command(GetUSBProtocolVersion(), timeout=20000)
+        if res.code != 0:
             raise ProtocolError("Unable to get USB Protocol version.")
         version = self._bulk_read(24, data_type=USBProtocolVersion)[0].version
         if version not in KNOWN_USB_PROTOCOL_VERSIONS:
@@ -265,16 +265,16 @@ class PRS500(Device):
         res = self.send_validated_command(SetBulkSize(\
                           chunk_size = 512*self.bulk_read_max_packet_size, \
                           unknown = 2))
-        if res.code != 0: 
+        if res.code != 0:
             raise ProtocolError("Unable to set bulk size.")
-        res = self.send_validated_command(UnlockDevice(key=self.key))#0x312d))        
-        if res.code != 0: 
+        res = self.send_validated_command(UnlockDevice(key=self.key))#0x312d))
+        if res.code != 0:
             raise DeviceLocked()
         res = self.send_validated_command(SetTime())
         if res.code != 0:
             raise ProtocolError("Could not set time on device")
 
-    def close(self):    
+    def close(self):
         """ Release device interface """
         try:
             self.handle.reset()
@@ -285,16 +285,16 @@ class PRS500(Device):
         self.in_session = False
 
     def _send_command(self, command, response_type=Response, timeout=1000):
-        """ 
-        Send L{command<Command>} to device and return its L{response<Response>}. 
+        """
+        Send L{command<Command>} to device and return its L{response<Response>}.
 
         @param command:       an object of type Command or one of its derived classes
         @param response_type: an object of type 'type'. The return packet
-        from the device is returned as an object of type response_type. 
-        @param timeout:       The time to wait for a response from the 
+        from the device is returned as an object of type response_type.
+        @param timeout:       The time to wait for a response from the
         device, in milliseconds. If there is no response, a L{usb.USBError} is raised.
         """
-        if self.log_packets: 
+        if self.log_packets:
             self.log_packet(command, "Command")
         bytes_sent = self.handle.control_msg(0x40, 0x80, command)
         if bytes_sent != len(command):
@@ -302,19 +302,19 @@ class PRS500(Device):
                                 + str(command))
         response = response_type(self.handle.control_msg(0xc0, 0x81, \
                                 Response.SIZE, timeout=timeout))
-        if self.log_packets: 
+        if self.log_packets:
             self.log_packet(response, "Response")
         return response
 
     def send_validated_command(self, command, cnumber=None, \
                                response_type=Response, timeout=1000):
-        """ 
-        Wrapper around L{_send_command} that checks if the 
-        C{Response.rnumber == cnumber or 
+        """
+        Wrapper around L{_send_command} that checks if the
+        C{Response.rnumber == cnumber or
         command.number if cnumber==None}. Also check that
         C{Response.type == Command.type}.
         """
-        if cnumber == None: 
+        if cnumber == None:
             cnumber = command.number
         res = self._send_command(command, response_type=response_type, \
                                                     timeout=timeout)
@@ -322,18 +322,18 @@ class PRS500(Device):
         return res
 
     def _bulk_write(self, data, packet_size=0x1000):
-        """ 
+        """
         Send data to device via a bulk transfer.
         @type data: Any listable type supporting __getslice__
-        @param packet_size: Size of packets to be sent to device. 
+        @param packet_size: Size of packets to be sent to device.
         C{data} is broken up into packets to be sent to device.
         """
         def bulk_write_packet(packet):
             self.handle.bulk_write(self.BULK_OUT_EP, packet)
-            if self.log_packets: 
+            if self.log_packets:
                 self.log_packet(Answer(packet), "Answer h->d")
 
-        bytes_left = len(data)        
+        bytes_left = len(data)
         if bytes_left + 16 <= packet_size:
             packet_size = bytes_left +16
             first_packet = Answer(bytes_left+16)
@@ -355,11 +355,11 @@ class PRS500(Device):
             pos = endpos
         res = Response(self.handle.control_msg(0xc0, 0x81, Response.SIZE, \
                         timeout=5000))
-        if self.log_packets: 
+        if self.log_packets:
             self.log_packet(res, "Response")
         if res.rnumber != 0x10005 or res.code != 0:
             raise ProtocolError("Sending via Bulk Transfer failed with response:\n"\
-                                +str(res))  
+                                +str(res))
         if res.data_size != len(data):
             raise ProtocolError("Unable to transfer all data to device. "+\
                                 "Response packet:\n"\
@@ -368,12 +368,12 @@ class PRS500(Device):
 
     def _bulk_read(self, bytes, command_number=0x00, packet_size=0x1000, \
                    data_type=Answer):
-        """ 
-        Read in C{bytes} bytes via a bulk transfer in 
-        packets of size S{<=} C{packet_size} 
-        @param data_type: an object of type type. 
-        The data packet is returned as an object of type C{data_type}.    
-        @return: A list of packets read from the device. 
+        """
+        Read in C{bytes} bytes via a bulk transfer in
+        packets of size S{<=} C{packet_size}
+        @param data_type: an object of type type.
+        The data packet is returned as an object of type C{data_type}.
+        @return: A list of packets read from the device.
         Each packet is of type data_type
         """
         msize = self.bulk_read_max_packet_size
@@ -392,7 +392,7 @@ class PRS500(Device):
         bytes_left = bytes
         packets = []
         while bytes_left > 0:
-            if packet_size > bytes_left: 
+            if packet_size > bytes_left:
                 packet_size = bytes_left
             packet = bulk_read_packet(data_type=data_type, size=packet_size)
             bytes_left -= len(packet)
@@ -404,8 +404,8 @@ class PRS500(Device):
 
     @safe
     def get_device_information(self, end_session=True):
-        """ 
-        Ask device for device information. See L{DeviceInfoQuery}. 
+        """
+        Ask device for device information. See L{DeviceInfoQuery}.
         @return: (device name, device version, software version on device, mime type)
         """
         size = self.send_validated_command(DeviceInfoQuery()).data[2] + 16
@@ -416,21 +416,21 @@ class PRS500(Device):
 
     @safe
     def path_properties(self, path, end_session=True):
-        """ 
-        Send command asking device for properties of C{path}. 
-        Return L{FileProperties}. 
+        """
+        Send command asking device for properties of C{path}.
+        Return L{FileProperties}.
         """
         res  = self.send_validated_command(PathQuery(path), \
                                                     response_type=ListResponse)
         data = self._bulk_read(0x28, data_type=FileProperties, \
                                            command_number=PathQuery.NUMBER)[0]
-        if path.endswith('/') and path != '/': 
+        if path.endswith('/') and path != '/':
             path = path[:-1]
         if res.path_not_found :
             raise PathError(path + " does not exist on device")
-        if res.is_invalid: 
+        if res.is_invalid:
             raise PathError(path + " is not a valid path")
-        if res.is_unmounted: 
+        if res.is_unmounted:
             raise PathError(path + " is not mounted")
         if res.permission_denied:
             raise PathError('Permission denied for: ' + path + '\nYou can only '+\
@@ -443,20 +443,20 @@ class PRS500(Device):
     @safe
     def get_file(self, path, outfile, end_session=True):
         """
-        Read the file at path on the device and write it to outfile.         
+        Read the file at path on the device and write it to outfile.
 
-        The data is fetched in chunks of size S{<=} 32K. Each chunk is 
+        The data is fetched in chunks of size S{<=} 32K. Each chunk is
         made of packets of size S{<=} 4K. See L{FileOpen},
-        L{FileRead} and L{FileClose} for details on the command packets used. 
+        L{FileRead} and L{FileClose} for details on the command packets used.
 
         @param outfile: file object like C{sys.stdout} or the result of an C{open} call
         """
-        if path.endswith("/"): 
+        if path.endswith("/"):
             path = path[:-1] # We only copy files
         cp = self.card_prefix(False)
         path = path.replace('card:/', cp if cp else '')
         _file = self.path_properties(path, end_session=False)
-        if _file.is_dir: 
+        if _file.is_dir:
             raise PathError("Cannot read as " + path + " is a directory")
         bytes = _file.file_size
         res = self.send_validated_command(FileOpen(path))
@@ -464,12 +464,12 @@ class PRS500(Device):
             raise PathError("Unable to open " + path + \
                                 " for reading. Response code: " + hex(res.code))
         _id = self._bulk_read(20, data_type=IdAnswer, \
-                                            command_number=FileOpen.NUMBER)[0].id    
+                                            command_number=FileOpen.NUMBER)[0].id
         # The first 16 bytes from the device are meta information on the packet stream
         bytes_left, chunk_size = bytes, 512 * self.bulk_read_max_packet_size -16
         packet_size, pos = 64 * self.bulk_read_max_packet_size, 0
-        while bytes_left > 0:      
-            if chunk_size > bytes_left: 
+        while bytes_left > 0:
+            if chunk_size > bytes_left:
                 chunk_size = bytes_left
             res = self.send_validated_command(FileIO(_id, pos, chunk_size))
             if res.code != 0:
@@ -477,21 +477,21 @@ class PRS500(Device):
                 raise ProtocolError("Error while reading from " + path + \
                                            ". Response code: " + hex(res.code))
             packets = self._bulk_read(chunk_size+16, \
-                        command_number=FileIO.RNUMBER, packet_size=packet_size)            
+                        command_number=FileIO.RNUMBER, packet_size=packet_size)
             try:
                 outfile.write("".join(map(chr, packets[0][16:])))
-                for i in range(1, len(packets)):                    
+                for i in range(1, len(packets)):
                     outfile.write("".join(map(chr, packets[i])))
             except IOError, err:
                 self.send_validated_command(FileClose(_id))
                 raise ArgumentError("File get operation failed. " + \
-                            "Could not write to local location: " + str(err))       
+                            "Could not write to local location: " + str(err))
             bytes_left -= chunk_size
             pos += chunk_size
-            if self.report_progress: 
+            if self.report_progress:
                 self.report_progress(int(100*((1.*pos)/bytes)))
-        self.send_validated_command(FileClose(_id)) 
-        # Not going to check response code to see if close was successful 
+        self.send_validated_command(FileClose(_id))
+        # Not going to check response code to see if close was successful
         # as there's not much we can do if it wasnt
 
     @safe
@@ -503,26 +503,26 @@ class PRS500(Device):
         @type path: string
         @param path: The path to list
         @type recurse: boolean
-        @param recurse: If true do a recursive listing    
-        @return: A list of tuples. The first element of each tuple is a path.  
-        The second element is a list of L{Files<File>}. 
-        The path is the path we are listing, the C{Files} are the 
-        files/directories in that path. If it is a recursive list, then the first 
-        element will be (C{path}, children), the next will be 
-        (child, its children) and so on. If it is not recursive the length of the 
+        @param recurse: If true do a recursive listing
+        @return: A list of tuples. The first element of each tuple is a path.
+        The second element is a list of L{Files<File>}.
+        The path is the path we are listing, the C{Files} are the
+        files/directories in that path. If it is a recursive list, then the first
+        element will be (C{path}, children), the next will be
+        (child, its children) and so on. If it is not recursive the length of the
         outermost list will be 1.
         """
-        def _list(path): 
+        def _list(path):
             """ Do a non recursive listsing of path """
-            if not path.endswith("/"): 
+            if not path.endswith("/"):
                 path += "/" # Initially assume path is a directory
             cp = self.card_prefix(False)
             path = path.replace('card:/', cp if cp else '')
             files = []
             candidate = self.path_properties(path, end_session=False)
-            if not candidate.is_dir: 
+            if not candidate.is_dir:
                 path = path[:-1]
-                data = self.path_properties(path, end_session=False)      
+                data = self.path_properties(path, end_session=False)
                 files = [ File((path, data)) ]
             else:
                 # Get query ID used to ask for next element in list
@@ -536,20 +536,20 @@ class PRS500(Device):
                 next = DirRead(_id)
                 items = []
                 while True:
-                    res = self.send_validated_command(next, response_type=ListResponse)        
+                    res = self.send_validated_command(next, response_type=ListResponse)
                     size = res.data_size + 16
                     data = self._bulk_read(size, data_type=ListAnswer, \
                                               command_number=DirRead.NUMBER)[0]
-                    # path_not_found seems to happen if the usb server 
+                    # path_not_found seems to happen if the usb server
                     # doesn't have the permissions to access the directory
-                    if res.is_eol or res.path_not_found: 
-                        break 
+                    if res.is_eol or res.path_not_found:
+                        break
                     elif res.code != 0:
                         raise ProtocolError("Unknown error occured while "+\
                             "reading contents of directory " + path + \
                             ". Response code: " + hex(res.code))
                     items.append(data.name)
-                self.send_validated_command(DirClose(_id)) 
+                self.send_validated_command(DirClose(_id))
                 # Ignore res.code as we cant do anything if close fails
                 for item in items:
                     ipath = path + item
@@ -568,23 +568,23 @@ class PRS500(Device):
 
     @safe
     def total_space(self, end_session=True):
-        """ 
+        """
         Get total space available on the mountpoints:
           1. Main memory
           2. Memory Stick
           3. SD Card
 
         @return: A 3 element list with total space in bytes of (1, 2, 3)
-        """    
+        """
         data = []
         for path in ("/Data/", "a:/", "b:/"):
             # Timeout needs to be increased as it takes time to read card
             res = self.send_validated_command(TotalSpaceQuery(path), \
-                        timeout=5000) 
+                        timeout=5000)
             buffer_size = 16 + res.data[2]
             pkt = self._bulk_read(buffer_size, data_type=TotalSpaceAnswer, \
                                     command_number=TotalSpaceQuery.NUMBER)[0]
-            data.append( pkt.total )    
+            data.append( pkt.total )
         return data
 
     @safe
@@ -600,26 +600,26 @@ class PRS500(Device):
                 return path
             except PathError:
                 return None
-    
+
     @safe
     def free_space(self, end_session=True):
-        """ 
+        """
         Get free space available on the mountpoints:
           1. Main memory
           2. Memory Stick
           3. SD Card
 
         @return: A 3 element list with free space in bytes of (1, 2, 3)
-        """    
+        """
         data = []
         for path in ("/", "a:/", "b:/"):
             # Timeout needs to be increased as it takes time to read card
             self.send_validated_command(FreeSpaceQuery(path), \
-                            timeout=5000) 
+                            timeout=5000)
             pkt = self._bulk_read(FreeSpaceAnswer.SIZE, \
                 data_type=FreeSpaceAnswer, \
                 command_number=FreeSpaceQuery.NUMBER)[0]
-            data.append( pkt.free )    
+            data.append( pkt.free )
         return data
 
     def _exists(self, path):
@@ -628,21 +628,21 @@ class PRS500(Device):
         try:
             dest = self.path_properties(path, end_session=False)
         except PathError, err:
-            if "does not exist" in str(err) or "not mounted" in str(err): 
+            if "does not exist" in str(err) or "not mounted" in str(err):
                 return (False, None)
-            else: raise 
+            else: raise
         return (True, dest)
 
     @safe
     def touch(self, path, end_session=True):
-        """ 
-        Create a file at path 
-        @todo: Update file modification time if it exists. 
+        """
+        Create a file at path
+        @todo: Update file modification time if it exists.
         Opening the file in write mode and then closing it doesn't work.
         """
         cp = self.card_prefix(False)
         path = path.replace('card:/', cp if cp else '')
-        if path.endswith("/") and len(path) > 1: 
+        if path.endswith("/") and len(path) > 1:
             path = path[:-1]
         exists, _file = self._exists(path)
         if exists and _file.is_dir:
@@ -651,18 +651,18 @@ class PRS500(Device):
             res = self.send_validated_command(FileCreate(path))
             if res.code != 0:
                 raise PathError("Could not create file " + path + \
-                                            ". Response code: " + str(hex(res.code)))      
+                                            ". Response code: " + str(hex(res.code)))
 
     @safe
     def put_file(self, infile, path, replace_file=False, end_session=True):
         """
         Put infile onto the devoce at path
-        @param infile: An open file object. infile must have a name attribute. 
+        @param infile: An open file object. infile must have a name attribute.
             If you are using a StringIO object set its name attribute manually.
-        @param path: The path on the device at which to put infile. 
+        @param path: The path on the device at which to put infile.
             It should point to an existing directory.
         @param replace_file: If True and path points to a file that already exists, it is replaced
-        """    
+        """
         pos = infile.tell()
         infile.seek(0, 2)
         bytes = infile.tell() - pos
@@ -673,12 +673,12 @@ class PRS500(Device):
         exists, dest = self._exists(path)
         if exists:
             if dest.is_dir:
-                if not path.endswith("/"): 
+                if not path.endswith("/"):
                     path += "/"
                 path += os.path.basename(infile.name)
                 return self.put_file(infile, path, replace_file=replace_file, end_session=False)
             else:
-                if not replace_file: 
+                if not replace_file:
                     raise PathError("Cannot write to " + \
                                     path + " as it already exists", path=path)
                 _file = self.path_properties(path, end_session=False)
@@ -693,7 +693,7 @@ class PRS500(Device):
             raise ProtocolError("Unable to open " + path + \
                         " for writing. Response code: " + hex(res.code))
         _id = self._bulk_read(20, data_type=IdAnswer, \
-                                command_number=FileOpen.NUMBER)[0].id    
+                                command_number=FileOpen.NUMBER)[0].id
 
         while data_left:
             data = array('B')
@@ -704,7 +704,7 @@ class PRS500(Device):
                 data.fromstring(ind)
                 if len(ind) < chunk_size:
                     raise EOFError
-            except EOFError: 
+            except EOFError:
                 data_left = False
             res = self.send_validated_command(FileIO(_id, pos, len(data), \
                                 mode=FileIO.WNUMBER))
@@ -715,7 +715,7 @@ class PRS500(Device):
             pos += len(data)
             if self.report_progress:
                 self.report_progress( int(100*(pos-start_pos)/(1.*bytes)) )
-        self.send_validated_command(FileClose(_id)) 
+        self.send_validated_command(FileClose(_id))
         # Ignore res.code as cant do anything if close fails
         _file = self.path_properties(path, end_session=False)
         if _file.file_size != pos:
@@ -727,7 +727,7 @@ class PRS500(Device):
     def del_file(self, path, end_session=True):
         """ Delete C{path} from device iff path is a file """
         data = self.path_properties(path, end_session=False)
-        if data.is_dir: 
+        if data.is_dir:
             raise PathError("Cannot delete directories")
         res = self.send_validated_command(FileDelete(path), \
                                                      response_type=ListResponse)
@@ -741,7 +741,7 @@ class PRS500(Device):
         if path.startswith('card:/'):
             cp = self.card_prefix(False)
             path = path.replace('card:/', cp if cp else '')
-        if not path.endswith("/"): 
+        if not path.endswith("/"):
             path += "/"
         error_prefix = "Cannot create directory " + path
         res = self.send_validated_command(DirCreate(path)).data[0]
@@ -764,8 +764,8 @@ class PRS500(Device):
         if not dir.is_dir:
             self.del_file(path, end_session=False)
         else:
-            if not path.endswith("/"):  
-                path += "/"        
+            if not path.endswith("/"):
+                path += "/"
             res = self.send_validated_command(DirDelete(path))
             if res.code == PathResponseCodes.HAS_CHILDREN:
                 raise PathError("Cannot delete directory " + path + \
@@ -778,24 +778,24 @@ class PRS500(Device):
     def card(self, end_session=True):
         """ Return path prefix to installed card or None """
         card = None
-        if self._exists("a:/")[0]: 
+        if self._exists("a:/")[0]:
             card = "a:"
-        if self._exists("b:/")[0]: 
-            card = "b:"    
+        if self._exists("b:/")[0]:
+            card = "b:"
         return card
 
     @safe
     def books(self, oncard=False, end_session=True):
-        """ 
+        """
         Return a list of ebooks on the device.
-        @param oncard: If True return a list of ebooks on the storage card, 
+        @param oncard: If True return a list of ebooks on the storage card,
                             otherwise return list of ebooks in main memory of device
 
         @return: L{BookList}
-        """    
+        """
         root = "/Data/media/"
         tfile = TemporaryFile()
-        if oncard:      
+        if oncard:
             try:
                 self.get_file("a:"+self.CACHE_XML, tfile, end_session=False)
                 root = "a:/"
@@ -804,9 +804,9 @@ class PRS500(Device):
                     self.get_file("b:"+self.CACHE_XML, tfile, end_session=False)
                     root = "b:/"
                 except PathError:  pass
-            if tfile.tell() == 0: 
+            if tfile.tell() == 0:
                 tfile = None
-        else: 
+        else:
             self.get_file(self.MEDIA_XML, tfile, end_session=False)
         bl = BookList(root=root, sfile=tfile)
         paths = bl.purge_corrupted_files()
@@ -822,26 +822,26 @@ class PRS500(Device):
         """
         Remove the books specified by paths from the device. The metadata
         cache on the device should also be updated.
-        """        
+        """
         for path in paths:
             self.del_file(path, end_session=False)
         fix_ids(booklists[0], booklists[1])
         self.sync_booklists(booklists, end_session=False)
-        
+
     @safe
     def sync_booklists(self, booklists, end_session=True):
         '''
         Upload bookslists to device.
-        @param booklists: A tuple containing the result of calls to 
+        @param booklists: A tuple containing the result of calls to
                                 (L{books}(oncard=False), L{books}(oncard=True)).
         '''
         fix_ids(*booklists)
         self.upload_book_list(booklists[0], end_session=False)
         if booklists[1].root:
             self.upload_book_list(booklists[1], end_session=False)
-    
+
     @safe
-    def upload_books(self, files, names, on_card=False, end_session=True, 
+    def upload_books(self, files, names, on_card=False, end_session=True,
                      metadata=None):
         card = self.card(end_session=False)
         prefix = card + '/' + self.CARD_PATH_PREFIX +'/' if on_card else '/Data/media/books/'
@@ -856,21 +856,21 @@ class PRS500(Device):
         space = self.free_space(end_session=False)
         mspace = space[0]
         cspace = space[1] if space[1] >= space[2] else space[2]
-        if on_card and size > cspace - 1024*1024: 
+        if on_card and size > cspace - 1024*1024:
             raise FreeSpaceError("There is insufficient free space "+\
                                           "on the storage card")
-        if not on_card and size > mspace - 2*1024*1024: 
+        if not on_card and size > mspace - 2*1024*1024:
             raise FreeSpaceError("There is insufficient free space " +\
                                          "in main memory")
-            
+
         for infile in infiles:
-            infile.seek(0)            
+            infile.seek(0)
             name = names.next()
             paths.append(prefix+name)
             self.put_file(infile, paths[-1], replace_file=True, end_session=False)
             ctimes.append(self.path_properties(paths[-1], end_session=False).ctime)
         return zip(paths, sizes, ctimes)
-            
+
     @classmethod
     def add_books_to_metadata(cls, locations, metadata, booklists):
         metadata = iter(metadata)
@@ -882,35 +882,35 @@ class PRS500(Device):
             name = (cls.CARD_PATH_PREFIX+'/' if on_card else 'books/') + name
             booklists[on_card].add_book(info, name, *location[1:])
         fix_ids(*booklists)
-        
+
     @safe
     def delete_books(self, paths, end_session=True):
         for path in paths:
             self.del_file(path, end_session=False)
-            
+
     @classmethod
     def remove_books_from_metadata(cls, paths, booklists):
         for path in paths:
             on_card = 1 if path[1] == ':' else 0
             booklists[on_card].remove_book(path)
         fix_ids(*booklists)
-            
+
     @safe
     def add_book(self, infile, name, info, booklists, oncard=False, \
                             sync_booklists=False, end_session=True):
         """
-        Add a book to the device. If oncard is True then the book is copied 
-        to the card rather than main memory. 
+        Add a book to the device. If oncard is True then the book is copied
+        to the card rather than main memory.
 
         @param infile: The source file, should be opened in "rb" mode
-        @param name: The name of the book file when uploaded to the 
-                                device. The extension of name must be one of 
+        @param name: The name of the book file when uploaded to the
+                                device. The extension of name must be one of
                                 the supported formats for this device.
-        @param info: A dictionary that must have the keys "title", "authors", "cover". 
+        @param info: A dictionary that must have the keys "title", "authors", "cover".
                      C{info["cover"]} should be a three element tuple (width, height, data)
                      where data is the image data in JPEG format as a string
-        @param booklists: A tuple containing the result of calls to 
-                                    (L{books}(oncard=False), L{books}(oncard=True)).    
+        @param booklists: A tuple containing the result of calls to
+                                    (L{books}(oncard=False), L{books}(oncard=True)).
         """
         infile.seek(0, 2)
         size = infile.tell()
@@ -922,11 +922,11 @@ class PRS500(Device):
         if oncard and size > cspace - 1024*1024:
             raise FreeSpaceError("There is insufficient free space "+\
                                               "on the storage card")
-        if not oncard and size > mspace - 1024*1024: 
+        if not oncard and size > mspace - 1024*1024:
             raise FreeSpaceError("There is insufficient free space " +\
                                              "in main memory")
         prefix  = "/Data/media/"
-        if oncard: 
+        if oncard:
             prefix = card + "/"
         else: name = "books/"+name
         path = prefix + name
@@ -943,12 +943,12 @@ class PRS500(Device):
         path = self.MEDIA_XML
         if not booklist.prefix:
             card = self.card(end_session=True)
-            if not card: 
+            if not card:
                 raise ArgumentError("Cannot upload list to card as "+\
                                                  "card is not present")
             path = card + self.CACHE_XML
-        f = StringIO()        
+        f = StringIO()
         booklist.write(f)
         f.seek(0)
         self.put_file(f, path, replace_file=True, end_session=False)
-        f.close()   
+        f.close()
diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index f4256c4c14..6e21c60d1b 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -24,7 +24,7 @@ class File(object):
             path = path[:-1]
         self.path = path
         self.name = os.path.basename(path)
-        
+
 
 class PRS505(Device):
     VENDOR_ID    = 0x054c   #: SONY Vendor Id
@@ -33,17 +33,17 @@ class PRS505(Device):
     PRODUCT_NAME = 'PRS-505'
     VENDOR_NAME  = 'SONY'
     FORMATS      = ['epub', 'lrf', 'lrx', 'rtf', 'pdf', 'txt']
-    
+
     MEDIA_XML    = 'database/cache/media.xml'
     CACHE_XML    = 'Sony Reader/database/cache.xml'
-    
+
     MAIN_MEMORY_VOLUME_LABEL  = 'Sony Reader Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'Sony Reader Storage Card'
-    
+
     OSX_NAME                  = 'Sony PRS-505'
-    
+
     CARD_PATH_PREFIX          = __appname__
-    
+
     FDI_TEMPLATE = \
 '''
   <device>
@@ -75,11 +75,11 @@ class PRS505(Device):
       </match>
   </device>
 '''.replace('%(app)s', __appname__)
-    
-    
+
+
     def __init__(self, log_packets=False):
         self._main_prefix = self._card_prefix = None
-        
+
     @classmethod
     def get_fdi(cls):
         return cls.FDI_TEMPLATE%dict(
@@ -90,7 +90,7 @@ class PRS505(Device):
                                      main_memory=cls.MAIN_MEMORY_VOLUME_LABEL,
                                      storage_card=cls.STORAGE_CARD_VOLUME_LABEL,
                                      )
-    
+
     @classmethod
     def is_device(cls, device_id):
         device_id = device_id.upper()
@@ -104,7 +104,7 @@ class PRS505(Device):
                'PID_'+pid in device_id:
             return True
         return False
-    
+
     @classmethod
     def get_osx_mountpoints(cls, raw=None):
         if raw is None:
@@ -112,7 +112,7 @@ class PRS505(Device):
             if not os.access(ioreg, os.X_OK):
                 ioreg = 'ioreg'
             raw = subprocess.Popen((ioreg+' -w 0 -S -c IOMedia').split(),
-                                   stdout=subprocess.PIPE).stdout.read()
+                                   stdout=subprocess.PIPE).communicate()[0]
         lines = raw.splitlines()
         names = {}
         for i, line in enumerate(lines):
@@ -130,9 +130,9 @@ class PRS505(Device):
                 break
         return names
 
-    
+
     def open_osx(self):
-        mount = subprocess.Popen('mount', shell=True, 
+        mount = subprocess.Popen('mount', shell=True,
                                  stdout=subprocess.PIPE).stdout.read()
         names = self.get_osx_mountpoints()
         dev_pat = r'/dev/%s(\w*)\s+on\s+([^\(]+)\s+'
@@ -144,12 +144,12 @@ class PRS505(Device):
         if card_pat is not None:
             card_pat = dev_pat%card_pat
             self._card_prefix = re.search(card_pat, mount).group(2) + os.sep
-            
-    
+
+
     def open_windows(self):
         time.sleep(6)
         drives = []
-        wmi = __import__('wmi', globals(), locals(), [], -1) 
+        wmi = __import__('wmi', globals(), locals(), [], -1)
         c = wmi.WMI()
         for drive in c.Win32_DiskDrive():
             if self.__class__.is_device(str(drive.PNPDeviceID)):
@@ -162,22 +162,22 @@ class PRS505(Device):
                     drives.append((drive.Index, prefix))
                 except IndexError:
                     continue
-                
-                
+
+
         if not drives:
             raise DeviceError(_('Unable to detect the %s disk drive. Try rebooting.')%self.__class__.__name__)
-        
+
         drives.sort(cmp=lambda a, b: cmp(a[0], b[0]))
         self._main_prefix = drives[0][1]
         if len(drives) > 1:
             self._card_prefix = drives[1][1]
-            
-    
+
+
     def open_linux(self):
         import dbus
-        bus = dbus.SystemBus() 
+        bus = dbus.SystemBus()
         hm  = dbus.Interface(bus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager"), "org.freedesktop.Hal.Manager")
-        
+
         def conditional_mount(dev, main_mem=True):
             mmo = bus.get_object("org.freedesktop.Hal", dev)
             label = mmo.GetPropertyString('volume.label', dbus_interface='org.freedesktop.Hal.Device')
@@ -186,11 +186,11 @@ class PRS505(Device):
             fstype = mmo.GetPropertyString('volume.fstype', dbus_interface='org.freedesktop.Hal.Device')
             if is_mounted:
                 return str(mount_point)
-            mmo.Mount(label, fstype, ['umask=077', 'uid='+str(os.getuid()), 'sync'], 
+            mmo.Mount(label, fstype, ['umask=077', 'uid='+str(os.getuid()), 'sync'],
                           dbus_interface='org.freedesktop.Hal.Device.Volume')
             return os.path.normpath('/media/'+label)+'/'
-    
-        
+
+
         mm = hm.FindDeviceStringMatch(__appname__+'.mainvolume', self.__class__.__name__)
         if not mm:
             raise DeviceError(_('Unable to detect the %s disk drive. Try rebooting.')%(self.__class__.__name__,))
@@ -201,21 +201,21 @@ class PRS505(Device):
                 break
             except dbus.exceptions.DBusException:
                 continue
-            
-            
+
+
         if not self._main_prefix:
             raise DeviceError('Could not open device for reading. Try a reboot.')
-            
+
         self._card_prefix = None
         cards = hm.FindDeviceStringMatch(__appname__+'.cardvolume', self.__class__.__name__)
         keys = []
         for card in cards:
             keys.append(int('UC_SD' in bus.get_object("org.freedesktop.Hal", card).GetPropertyString('info.parent', dbus_interface='org.freedesktop.Hal.Device')))
-            
+
         cards = zip(cards, keys)
         cards.sort(cmp=lambda x, y: cmp(x[1], y[1]))
         cards = [i[0] for i in cards]
-        
+
         for dev in cards:
             try:
                 self._card_prefix = conditional_mount(dev, False)+os.sep
@@ -224,8 +224,8 @@ class PRS505(Device):
                 import traceback
                 print traceback
                 continue
-            
-    
+
+
     def open(self):
         time.sleep(5)
         self._main_prefix = self._card_prefix = None
@@ -262,16 +262,16 @@ class PRS505(Device):
                 self._card_prefix = None
                 import traceback
                 traceback.print_exc()
-            
+
     def set_progress_reporter(self, pr):
         self.report_progress = pr
-        
+
     def get_device_information(self, end_session=True):
         return (self.__class__.__name__, '', '', '')
-    
+
     def card_prefix(self, end_session=True):
         return self._card_prefix
-    
+
     @classmethod
     def _windows_space(cls, prefix):
         if prefix is None:
@@ -288,7 +288,7 @@ class PRS505(Device):
             else: raise
         mult = sectors_per_cluster * bytes_per_sector
         return total_clusters * mult, free_clusters * mult
-    
+
     def total_space(self, end_session=True):
         msz = csz = 0
         if not iswindows:
@@ -301,9 +301,9 @@ class PRS505(Device):
         else:
             msz = self._windows_space(self._main_prefix)[0]
             csz = self._windows_space(self._card_prefix)[0]
-                
+
         return (msz, 0, csz)
-    
+
     def free_space(self, end_session=True):
         msz = csz = 0
         if not iswindows:
@@ -316,9 +316,9 @@ class PRS505(Device):
         else:
             msz = self._windows_space(self._main_prefix)[1]
             csz = self._windows_space(self._card_prefix)[1]
-                
+
         return (msz, 0, csz)
-                
+
     def books(self, oncard=False, end_session=True):
         if oncard and self._card_prefix is None:
             return []
@@ -331,7 +331,7 @@ class PRS505(Device):
             if os.path.exists(path):
                 os.unlink(path)
         return bl
-    
+
     def munge_path(self, path):
         if path.startswith('/') and not (path.startswith(self._main_prefix) or \
             (self._card_prefix and path.startswith(self._card_prefix))):
@@ -339,12 +339,12 @@ class PRS505(Device):
         elif path.startswith('card:'):
             path = path.replace('card:', self._card_prefix[:-1])
         return path
-            
+
     def mkdir(self, path, end_session=True):
         """ Make directory """
         path = self.munge_path(path)
         os.mkdir(path)
-        
+
     def list(self, path, recurse=False, end_session=True, munge=True):
         if munge:
             path = self.munge_path(path)
@@ -356,12 +356,12 @@ class PRS505(Device):
             if recurse and _file.is_dir:
                 dirs[len(dirs):] = self.list(_file.path, recurse=True, munge=False)
         return dirs
-    
+
     def get_file(self, path, outfile, end_session=True):
         path = self.munge_path(path)
         src = open(path, 'rb')
         shutil.copyfileobj(src, outfile, 10*1024*1024)
-                 
+
     def put_file(self, infile, path, replace_file=False, end_session=True):
         path = self.munge_path(path)
         if os.path.isdir(path):
@@ -372,25 +372,25 @@ class PRS505(Device):
         shutil.copyfileobj(infile, dest, 10*1024*1024)
         dest.flush()
         dest.close()
-        
+
     def rm(self, path, end_session=True):
         path = self.munge_path(path)
         os.unlink(path)
-        
+
     def touch(self, path, end_session=True):
         path = self.munge_path(path)
         if not os.path.exists(path):
             open(path, 'w').close()
         if not os.path.isdir(path):
             os.utime(path, None)
-            
-    def upload_books(self, files, names, on_card=False, end_session=True, 
+
+    def upload_books(self, files, names, on_card=False, end_session=True,
                      metadata=None):
         if on_card and not self._card_prefix:
             raise ValueError(_('The reader has no storage card connected.'))
         path = os.path.join(self._card_prefix, self.CARD_PATH_PREFIX) if on_card \
                else os.path.join(self._main_prefix, 'database', 'media', 'books')
-               
+
         def get_size(obj):
             if hasattr(obj, 'seek'):
                 obj.seek(0, 2)
@@ -398,27 +398,27 @@ class PRS505(Device):
                 obj.seek(0)
                 return size
             return os.path.getsize(obj)
-        
+
         sizes = map(get_size, files)
         size = sum(sizes)
         space = self.free_space()
         mspace = space[0]
         cspace = space[2]
-        if on_card and size > cspace - 1024*1024: 
+        if on_card and size > cspace - 1024*1024:
             raise FreeSpaceError("There is insufficient free space "+\
                                           "on the storage card")
-        if not on_card and size > mspace - 2*1024*1024: 
+        if not on_card and size > mspace - 2*1024*1024:
             raise FreeSpaceError("There is insufficient free space " +\
                                          "in main memory")
-            
+
         paths, ctimes = [], []
-        
+
         names = iter(names)
         for infile in files:
             close = False
             if not hasattr(infile, 'read'):
                 infile, close = open(infile, 'rb'), True
-            infile.seek(0)            
+            infile.seek(0)
             name = names.next()
             paths.append(os.path.join(path, name))
             if not os.path.exists(os.path.dirname(paths[-1])):
@@ -428,7 +428,7 @@ class PRS505(Device):
                 infile.close()
             ctimes.append(os.path.getctime(paths[-1]))
         return zip(paths, sizes, ctimes, cycle([on_card]))
-    
+
     @classmethod
     def add_books_to_metadata(cls, locations, metadata, booklists):
         metadata = iter(metadata)
@@ -441,12 +441,12 @@ class PRS505(Device):
             name = name.replace('//', '/')
             booklists[on_card].add_book(info, name, *location[1:-1])
         fix_ids(*booklists)
-        
+
     def delete_books(self, paths, end_session=True):
         for path in paths:
             if os.path.exists(path):
                 os.unlink(path)
-            
+
     @classmethod
     def remove_books_from_metadata(cls, paths, booklists):
         for path in paths:
@@ -454,7 +454,7 @@ class PRS505(Device):
                 if hasattr(bl, 'remove_book'):
                     bl.remove_book(path)
         fix_ids(*booklists)
-        
+
     def sync_booklists(self, booklists, end_session=True):
         fix_ids(*booklists)
         if not os.path.exists(self._main_prefix):
@@ -468,9 +468,9 @@ class PRS505(Device):
             f = open(self._card_prefix + self.__class__.CACHE_XML, 'wb')
             booklists[1].write(f)
             f.close()
-            
-    
-     
+
+
+
 
 def main(args=sys.argv):
     return 0
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 5943e2e13f..eb86cb7edd 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -190,7 +190,7 @@ class Device(_Device):
 
         self._main_prefix = drives.get('main')
         self._card_prefix = drives.get('card')
-        
+
         if not self._main_prefix:
             raise DeviceError(_('Unable to detect the %s disk drive. Try rebooting.') % self.__class__.__name__)
 
@@ -200,7 +200,7 @@ class Device(_Device):
             if not os.access(ioreg, os.X_OK):
                 ioreg = 'ioreg'
             raw = subprocess.Popen((ioreg+' -w 0 -S -c IOMedia').split(),
-                                   stdout=subprocess.PIPE).stdout.read()
+                                   stdout=subprocess.PIPE).communicate()[0]
         lines = raw.splitlines()
         names = {}
 
diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index f52264f8d0..211761e415 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -30,7 +30,7 @@ options. the available options depend on the input and output file types. \
 To get help on them specify the input and output file and then use the -h \
 option.
 
-For full documentation of the conversion system see 
+For full documentation of the conversion system see
 ''') + 'http://calibre.kovidgoyal.net/user_manual/conversion.html'
 
 import sys, os
@@ -50,22 +50,22 @@ def check_command_line_options(parser, args, log):
         print_help(parser)
         log.error('\n\nYou must specify the input AND output files')
         raise SystemExit(1)
-    
+
     input = os.path.abspath(args[1])
     if not os.access(input, os.R_OK):
         log.error('Cannot read from', input)
         raise SystemExit(1)
-    
+
     output = args[2]
     if output.startswith('.'):
         output = os.path.splitext(os.path.basename(input))[0]+output
     output = os.path.abspath(output)
-    
+
     if '.' in output:
         if os.path.exists(output):
             log.warn('WARNING:', output, 'exists. Deleting.')
             os.remove(output)
-        
+
     return input, output
 
 def option_recommendation_to_cli_option(add_option, rec):
@@ -79,18 +79,18 @@ def option_recommendation_to_cli_option(add_option, rec):
 def add_input_output_options(parser, plumber):
     input_options, output_options = \
                                 plumber.input_options, plumber.output_options
-    
+
     def add_options(group, options):
         for opt in options:
             option_recommendation_to_cli_option(group, opt)
-            
+
     if input_options:
         title = _('INPUT OPTIONS')
         io = OptionGroup(parser, title, _('Options to control the processing'
                           ' of the input %s file')%plumber.input_fmt)
         add_options(io.add_option, input_options)
         parser.add_option_group(io)
-        
+
     if output_options:
         title = plumber.output_fmt.upper() + ' ' + _('OPTIONS')
         oo = OptionGroup(parser, title, _('Options to control the processing'
@@ -106,7 +106,7 @@ def add_pipeline_options(parser, plumber):
                      'output_profile',
                      ]
                     ),
-              
+
               'METADATA' : (_('Options to set metadata in the output'),
                             plumber.metadata_option_names,
                             ),
@@ -114,19 +114,19 @@ def add_pipeline_options(parser, plumber):
                         [
                          'verbose',
                          ]),
-                         
-                
+
+
               }
-    
+
     group_order = ['', 'METADATA', 'DEBUG']
-    
+
     for group in group_order:
         desc, options = groups[group]
         if group:
             group = OptionGroup(parser, group, desc)
             parser.add_option_group(group)
         add_option = group.add_option if group != '' else parser.add_option
-        
+
         for name in options:
             rec = plumber.get_option_by_name(name)
             if rec.level < rec.HIGH:
@@ -141,27 +141,27 @@ def main(args=sys.argv):
     if len(args) < 3:
         print_help(parser, log)
         return 1
-    
+
     input, output = check_command_line_options(parser, args, log)
-    
+
     from calibre.ebooks.conversion.plumber import Plumber
-    
+
     plumber = Plumber(input, output, log)
     add_input_output_options(parser, plumber)
     add_pipeline_options(parser, plumber)
-    
+
     opts = parser.parse_args(args)[0]
-    recommendations = [(n.dest, getattr(opts, n.dest), 
+    recommendations = [(n.dest, getattr(opts, n.dest),
                         OptionRecommendation.HIGH) \
                                         for n in parser.options_iter()
                                         if n.dest]
     plumber.merge_ui_recommendations(recommendations)
-    
+
     plumber.run()
-    
+
     log(_('Output saved to'), ' ', plumber.output)
-    
+
     return 0
-    
+
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 75a6687c4e..0e2f98fde4 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -5,31 +5,44 @@ __docformat__ = 'restructuredtext en'
 
 import os
 
-from calibre.customize.conversion import OptionRecommendation 
+from calibre.customize.conversion import OptionRecommendation
 from calibre.customize.ui import input_profiles, output_profiles, \
         plugin_for_input_format, plugin_for_output_format
+from calibre.ebooks.conversion.preprocess import HTMLPreProcessor
 
 class OptionValues(object):
     pass
 
 class Plumber(object):
-    
+    '''
+    The `Plumber` manages the conversion pipeline. An UI should call the methods
+    :method:`merge_ui_recommendations` and then :method:`run`. The plumber will
+    take care of the rest.
+    '''
+
     metadata_option_names = [
-        'title', 'authors', 'title_sort', 'author_sort', 'cover', 'comments', 
-        'publisher', 'series', 'series_index', 'rating', 'isbn', 
+        'title', 'authors', 'title_sort', 'author_sort', 'cover', 'comments',
+        'publisher', 'series', 'series_index', 'rating', 'isbn',
         'tags', 'book_producer', 'language'
         ]
-    
+
     def __init__(self, input, output, log):
+        '''
+        :param input: Path to input file.
+        :param output: Path to output file/directory
+        '''
         self.input = input
         self.output = output
         self.log = log
-        
+
+        # Initialize the conversion options that are independent of input and
+        # output formats. The input and output plugins can still disable these
+        # options via recommendations.
         self.pipeline_options = [
 
-OptionRecommendation(name='verbose', 
+OptionRecommendation(name='verbose',
             recommended_value=0, level=OptionRecommendation.LOW,
-            short_switch='v', 
+            short_switch='v',
             help=_('Level of verbosity. Specify multiple times for greater '
                    'verbosity.')
         ),
@@ -54,15 +67,15 @@ OptionRecommendation(name='output_profile',
                    'will work on a device. For example EPUB on the SONY reader.'
                    )
         ),
-        
-OptionRecommendation(name='read_metadata_from_opf', 
+
+OptionRecommendation(name='read_metadata_from_opf',
             recommended_value=None, level=OptionRecommendation.LOW,
-            short_switch='m', 
+            short_switch='m',
             help=_('Read metadata from the specified OPF file. Metadata read '
-                   'from this file will override any metadata in the source ' 
+                   'from this file will override any metadata in the source '
                    'file.')
         ),
-        
+
 OptionRecommendation(name='title',
     recommended_value=None, level=OptionRecommendation.LOW,
     help=_('Set the title.')),
@@ -120,57 +133,70 @@ OptionRecommendation(name='language',
     help=_('Set the language.')),
 ]
 
-        
+
         input_fmt = os.path.splitext(input)[1]
         if not input_fmt:
             raise ValueError('Input file must have an extension')
         input_fmt = input_fmt[1:].lower()
-        
+
         output_fmt = os.path.splitext(output)[1]
         if not output_fmt:
             output_fmt = '.oeb'
         output_fmt = output_fmt[1:].lower()
-        
+
         self.input_plugin = plugin_for_input_format(input_fmt)
         self.output_plugin = plugin_for_output_format(output_fmt)
-        
+
         if self.input_plugin is None:
             raise ValueError('No plugin to handle input format: '+input_fmt)
-        
+
         if self.output_plugin is None:
             raise ValueError('No plugin to handle output format: '+output_fmt)
-        
+
         self.input_fmt = input_fmt
         self.output_fmt = output_fmt
-        
+
+        # Build set of all possible options. Two options are equal iff their
+        # names are the same.
         self.input_options  = self.input_plugin.options.union(
                                     self.input_plugin.common_options)
         self.output_options = self.output_plugin.options.union(
-                                    self.output_plugin.common_options)  
-    
+                                    self.output_plugin.common_options)
+
+        # Remove the options that have been disabled by recommendations from the
+        # plugins.
         self.merge_plugin_recommendations()
 
     def get_option_by_name(self, name):
-        for group in (self.input_options, self.pipeline_options, 
+        for group in (self.input_options, self.pipeline_options,
                       self.output_options):
             for rec in group:
                 if rec.option == name:
                     return rec
-        
+
     def merge_plugin_recommendations(self):
         for source in (self.input_plugin, self.output_plugin):
             for name, val, level in source.recommendations:
                 rec = self.get_option_by_name(name)
                 if rec is not None and rec.level <= level:
                     rec.recommended_value = val
-    
+
     def merge_ui_recommendations(self, recommendations):
+        '''
+        Merge recommendations from the UI. As long as the UI recommendation
+        level is >= the baseline recommended level, the UI value is used,
+        *except* if the baseline has a recommendation level of `HIGH`.
+        '''
         for name, val, level in recommendations:
             rec = self.get_option_by_name(name)
             if rec is not None and rec.level <= level and rec.level < rec.HIGH:
                 rec.recommended_value = val
-    
+
     def read_user_metadata(self):
+        '''
+        Read all metadata specified by the user. Command line options override
+        metadata from a specified OPF file.
+        '''
         from calibre.ebooks.metadata import MetaInformation, string_to_authors
         from calibre.ebooks.metadata.opf2 import OPF
         mi = MetaInformation(None, [])
@@ -194,43 +220,56 @@ OptionRecommendation(name='language',
             mi.cover_data = ('', open(mi.cover, 'rb').read())
             mi.cover = None
         self.user_metadata = mi
-            
-    
+
+
     def setup_options(self):
+        '''
+        Setup the `self.opts` object.
+        '''
         self.opts = OptionValues()
-        for group in (self.input_options, self.pipeline_options, 
+        for group in (self.input_options, self.pipeline_options,
                   self.output_options):
             for rec in group:
                 setattr(self.opts, rec.option.name, rec.recommended_value)
-                
+
         for x in input_profiles():
             if x.short_name == self.opts.input_profile:
                 self.opts.input_profile = x
                 break
-            
+
         for x in output_profiles():
             if x.short_name == self.opts.output_profile:
                 self.opts.output_profile = x
                 break
-            
+
         self.read_user_metadata()
-    
+
     def run(self):
+        '''
+        Run the conversion pipeline
+        '''
+        # Setup baseline option values
         self.setup_options()
+
+        # Run any preprocess plugins
         from calibre.customize.ui import run_plugins_on_preprocess
         self.input = run_plugins_on_preprocess(self.input)
-        
+
+        # Create an OEBBook from the input file. The input plugin does all the
+        # heavy lifting.
         from calibre.ebooks.oeb.reader import OEBReader
         from calibre.ebooks.oeb.base import OEBBook
-        parse_cache, accelerators = {}, {}
-        
-        opfpath = self.input_plugin(open(self.input, 'rb'), self.opts, 
-                                    self.input_fmt, parse_cache, self.log,
+        accelerators = {}
+
+        opfpath = self.input_plugin(open(self.input, 'rb'), self.opts,
+                                    self.input_fmt, self.log,
                                     accelerators)
-        
+        html_preprocessor = HTMLPreProcessor()
         self.reader = OEBReader()
-        self.oeb = OEBBook(self.log, parse_cache=parse_cache) 
+        self.oeb = OEBBook(self.log, html_preprocessor=html_preprocessor)
+        # Read OEB Book into OEBBook
         self.reader(self.oeb, opfpath)
-        
-    
-        
\ No newline at end of file
+
+
+
+
diff --git a/src/calibre/ebooks/conversion/preprocess.py b/src/calibre/ebooks/conversion/preprocess.py
new file mode 100644
index 0000000000..f544a331d8
--- /dev/null
+++ b/src/calibre/ebooks/conversion/preprocess.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import re, functools
+
+from calibre import entity_to_unicode
+
+XMLDECL_RE    = re.compile(r'^\s*<[?]xml.*?[?]>')
+SVG_NS       = 'http://www.w3.org/2000/svg'
+XLINK_NS     = 'http://www.w3.org/1999/xlink'
+
+convert_entities = functools.partial(entity_to_unicode, exceptions=['quot', 'apos', 'lt', 'gt', 'amp'])
+_span_pat = re.compile('<span.*?</span>', re.DOTALL|re.IGNORECASE)
+
+
+def sanitize_head(match):
+    x = match.group(1)
+    x = _span_pat.sub('', x)
+    return '<head>\n'+x+'\n</head>'
+
+
+class CSSPreProcessor(object):
+
+    PAGE_PAT   = re.compile(r'@page[^{]*?{[^}]*?}')
+
+    def __call__(self, data):
+        data = self.PAGE_PAT.sub('', data)
+        return data
+
+class HTMLPreProcessor(object):
+
+    PREPROCESS = [
+                  # Some idiotic HTML generators (Frontpage I'm looking at you)
+                  # Put all sorts of crap into <head>. This messes up lxml
+                  (re.compile(r'<head[^>]*>(.*?)</head>', re.IGNORECASE|re.DOTALL),
+                   sanitize_head),
+                  # Convert all entities, since lxml doesn't handle them well
+                  (re.compile(r'&(\S+?);'), convert_entities),
+                  # Remove the <![if/endif tags inserted by everybody's darling, MS Word
+                  (re.compile(r'</{0,1}!\[(end){0,1}if\]{0,1}>', re.IGNORECASE),
+                   lambda match: ''),
+                  ]
+
+    # Fix pdftohtml markup
+    PDFTOHTML  = [
+                  # Remove <hr> tags
+                  (re.compile(r'<hr.*?>', re.IGNORECASE), lambda match: '<br />'),
+                  # Remove page numbers
+                  (re.compile(r'\d+<br>', re.IGNORECASE), lambda match: ''),
+                  # Remove <br> and replace <br><br> with <p>
+                  (re.compile(r'<br.*?>\s*<br.*?>', re.IGNORECASE), lambda match: '<p>'),
+                  (re.compile(r'(.*)<br.*?>', re.IGNORECASE),
+                   lambda match: match.group() if \
+                           re.match('<', match.group(1).lstrip()) or \
+                           len(match.group(1)) < 40  else match.group(1)),
+                  # Remove hyphenation
+                  (re.compile(r'-\n\r?'), lambda match: ''),
+
+                  # Remove gray background
+                  (re.compile(r'<BODY[^<>]+>'), lambda match : '<BODY>'),
+
+                  # Remove non breaking spaces
+                  (re.compile(ur'\u00a0'), lambda match : ' '),
+
+                  ]
+
+    # Fix Book Designer markup
+    BOOK_DESIGNER = [
+                     # HR
+                     (re.compile('<hr>', re.IGNORECASE),
+                      lambda match : '<span style="page-break-after:always"> </span>'),
+                     # Create header tags
+                     (re.compile('<h2[^><]*?id=BookTitle[^><]*?(align=)*(?(1)(\w+))*[^><]*?>[^><]*?</h2>', re.IGNORECASE),
+                      lambda match : '<h1 id="BookTitle" align="%s">%s</h1>'%(match.group(2) if match.group(2) else 'center', match.group(3))),
+                     (re.compile('<h2[^><]*?id=BookAuthor[^><]*?(align=)*(?(1)(\w+))*[^><]*?>[^><]*?</h2>', re.IGNORECASE),
+                      lambda match : '<h2 id="BookAuthor" align="%s">%s</h2>'%(match.group(2) if match.group(2) else 'center', match.group(3))),
+                     (re.compile('<span[^><]*?id=title[^><]*?>(.*?)</span>', re.IGNORECASE|re.DOTALL),
+                      lambda match : '<h2 class="title">%s</h2>'%(match.group(1),)),
+                     (re.compile('<span[^><]*?id=subtitle[^><]*?>(.*?)</span>', re.IGNORECASE|re.DOTALL),
+                      lambda match : '<h3 class="subtitle">%s</h3>'%(match.group(1),)),
+                     ]
+
+    def is_baen(self, src):
+        return re.compile(r'<meta\s+name="Publisher"\s+content=".*?Baen.*?"',
+                          re.IGNORECASE).search(src) is not None
+
+    def is_book_designer(self, raw):
+        return re.search('<H2[^><]*id=BookTitle', raw) is not None
+
+    def is_pdftohtml(self, src):
+        return '<!-- created by calibre\'s pdftohtml -->' in src[:1000]
+
+    def __call__(self, html, remove_special_chars=None):
+        if remove_special_chars is not None:
+            html = remove_special_chars.sub('', html)
+        if self.is_baen(html):
+            rules = []
+        elif self.is_book_designer(html):
+            rules = self.BOOK_DESIGNER
+        elif self.is_pdftohtml(html):
+            rules = self.PDFTOHTML
+        else:
+            rules = []
+        for rule in self.PREPROCESS + rules:
+            html = rule[0].sub(rule[1], html)
+
+        # Handle broken XHTML w/ SVG (ugh)
+        if 'svg:' in html and SVG_NS not in html:
+            html = html.replace(
+                '<html', '<html xmlns:svg="%s"' % SVG_NS, 1)
+        if 'xlink:' in html and XLINK_NS not in html:
+            html = html.replace(
+                '<html', '<html xmlns:xlink="%s"' % XLINK_NS, 1)
+
+        html = XMLDECL_RE.sub('', html)
+
+        return html
+
diff --git a/src/calibre/ebooks/epub/iterator.py b/src/calibre/ebooks/epub/iterator.py
index 8e0936e708..e55d402bef 100644
--- a/src/calibre/ebooks/epub/iterator.py
+++ b/src/calibre/ebooks/epub/iterator.py
@@ -12,7 +12,7 @@ from PyQt4.Qt import QFontDatabase
 
 from calibre.ebooks.epub.from_any import MAP
 from calibre.ebooks.epub.from_html import TITLEPAGE
-from calibre.ebooks.epub import config 
+from calibre.ebooks.epub import config
 from calibre.ebooks.metadata.opf2 import OPF
 from calibre.ptempfile import TemporaryDirectory
 from calibre.ebooks.chardet import xml_to_unicode
@@ -31,13 +31,15 @@ def character_count(html):
     return count
 
 class UnsupportedFormatError(Exception):
-    
+
     def __init__(self, fmt):
-        Exception.__init__(self, _('%s format books are not supported')%fmt.upper()) 
+        Exception.__init__(self, _('%s format books are not supported')%fmt.upper())
 
 class SpineItem(unicode):
-    
+
     def __new__(cls, *args):
+        args = list(args)
+        args[0] = args[0].partition('#')[0]
         obj = super(SpineItem, cls).__new__(cls, *args)
         path = args[0]
         raw = open(path, 'rb').read()
@@ -63,10 +65,11 @@ def is_supported(path):
     return ext in list(MAP.keys())+['html', 'opf']
 
 class EbookIterator(object):
-    
+
     CHARACTERS_PER_PAGE = 1000
-    
+
     def __init__(self, pathtoebook):
+        pathtoebook = pathtoebook.strip()
         self.pathtoebook = os.path.abspath(pathtoebook)
         self.config = DynamicConfig(name='iterator')
         ext = os.path.splitext(pathtoebook)[1].replace('.', '').lower()
@@ -77,17 +80,17 @@ class EbookIterator(object):
         if ext not in map.keys():
             raise UnsupportedFormatError(ext)
         self.to_opf = map[ext]
-    
+
     def search(self, text, index):
         text = text.lower()
         for i, path in enumerate(self.spine):
             if i > index:
                 if text in open(path, 'rb').read().decode(path.encoding).lower():
                     return i
-    
+
     def find_embedded_fonts(self):
         '''
-        This will become unnecessary once Qt WebKit supports the @font-face rule. 
+        This will become unnecessary once Qt WebKit supports the @font-face rule.
         '''
         for item in self.opf.manifest:
             if item.mime_type and 'css' in item.mime_type.lower():
@@ -108,7 +111,7 @@ class EbookIterator(object):
                                     print 'WARNING: Family aliasing not supported:', block
                                 else:
                                     print 'Loaded embedded font:', repr(family)
-    
+
     def __enter__(self):
         self._tdir = TemporaryDirectory('_ebook_iter')
         self.base  = self._tdir.__enter__()
@@ -116,50 +119,50 @@ class EbookIterator(object):
         self.pathtoopf = self.to_opf(self.pathtoebook, self.base, opts)
         self.opf = OPF(self.pathtoopf, os.path.dirname(self.pathtoopf))
         self.spine = [SpineItem(i.path) for i in self.opf.spine]
-        
+
         cover = self.opf.cover
         if os.path.splitext(self.pathtoebook)[1].lower() in \
                                     ('.lit', '.mobi', '.prc') and cover:
             cfile = os.path.join(os.path.dirname(self.spine[0]), 'calibre_ei_cover.html')
             open(cfile, 'wb').write(TITLEPAGE%cover)
             self.spine[0:0] = [SpineItem(cfile)]
-            
+
         if self.opf.path_to_html_toc is not None and \
            self.opf.path_to_html_toc not in self.spine:
             self.spine.append(SpineItem(self.opf.path_to_html_toc))
-            
-        
+
+
         sizes = [i.character_count for i in self.spine]
         self.pages = [math.ceil(i/float(self.CHARACTERS_PER_PAGE)) for i in sizes]
         for p, s in zip(self.pages, self.spine):
             s.pages = p
         start = 1
-        
-        
+
+
         for s in self.spine:
             s.start_page = start
             start += s.pages
             s.max_page = s.start_page + s.pages - 1
         self.toc = self.opf.toc
-        
+
         self.find_embedded_fonts()
-        self.read_bookmarks() 
-        
+        self.read_bookmarks()
+
         return self
-    
+
     def parse_bookmarks(self, raw):
         for line in raw.splitlines():
             if line.count('^') > 0:
                 tokens = line.rpartition('^')
                 title, ref = tokens[0], tokens[2]
                 self.bookmarks.append((title, ref))
-    
+
     def serialize_bookmarks(self, bookmarks):
         dat = []
         for title, bm in bookmarks:
             dat.append(u'%s^%s'%(title, bm))
         return (u'\n'.join(dat) +'\n').encode('utf-8')
-    
+
     def read_bookmarks(self):
         self.bookmarks = []
         bmfile = os.path.join(self.base, 'META-INF', 'calibre_bookmarks.txt')
@@ -170,8 +173,8 @@ class EbookIterator(object):
             saved = self.config['bookmarks_'+self.pathtoebook]
             if saved:
                 raw = saved
-        self.parse_bookmarks(raw) 
-                    
+        self.parse_bookmarks(raw)
+
     def save_bookmarks(self, bookmarks=None):
         if bookmarks is None:
             bookmarks = self.bookmarks
@@ -190,7 +193,7 @@ class EbookIterator(object):
             zipf.writestr('META-INF/calibre_bookmarks.txt', dat)
         else:
             self.config['bookmarks_'+self.pathtoebook] = dat
-    
+
     def add_bookmark(self, bm):
         dups = []
         for x in self.bookmarks:
@@ -200,9 +203,9 @@ class EbookIterator(object):
             self.bookmarks.remove(x)
         self.bookmarks.append(bm)
         self.save_bookmarks()
-        
+
     def set_bookmarks(self, bookmarks):
         self.bookmarks = bookmarks
-        
+
     def __exit__(self, *args):
         self._tdir.__exit__(*args)
diff --git a/src/calibre/ebooks/html.py b/src/calibre/ebooks/html.py
index 696298dc58..5e2fc023f4 100644
--- a/src/calibre/ebooks/html.py
+++ b/src/calibre/ebooks/html.py
@@ -354,7 +354,10 @@ class PreProcessor(object):
                   (re.compile(r'-\n\r?'), lambda match: ''),
                   
                   # Remove gray background
-                  (re.compile(r'<BODY[^<>]+>'), lambda match : '<BODY>')
+                  (re.compile(r'<BODY[^<>]+>'), lambda match : '<BODY>'),
+                  
+                  # Remove non breaking spaces
+                  (re.compile(ur'\u00a0'), lambda match : ' '),
                   
                   ]
     
diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py
index 1ac68f3866..f32a65e010 100644
--- a/src/calibre/ebooks/lit/reader.py
+++ b/src/calibre/ebooks/lit/reader.py
@@ -129,8 +129,6 @@ class UnBinary(object):
         self.tag_map, self.attr_map, self.tag_to_attr_map = map
         self.is_html = map is HTML_MAP
         self.tag_atoms, self.attr_atoms = atoms
-        self.opf = map is OPF_MAP
-        self.bin = bin
         self.dir = os.path.dirname(path)
         buf = StringIO()
         self.binary_to_text(bin, buf)
@@ -210,7 +208,8 @@ class UnBinary(object):
                         continue
                     if flags & FLAG_ATOM:
                         if not self.tag_atoms or tag not in self.tag_atoms:
-                            raise LitError("atom tag %d not in atom tag list" % tag)
+                            raise LitError(
+                                "atom tag %d not in atom tag list" % tag)
                         tag_name = self.tag_atoms[tag]
                         current_map = self.attr_atoms
                     elif tag < len(self.tag_map):
@@ -295,7 +294,7 @@ class UnBinary(object):
                             c = '&quot;'
                         elif c == '<':
                             c = '&lt;'
-                        self.buf.write(c.encode('ascii', 'xmlcharrefreplace'))
+                        buf.write(c.encode('ascii', 'xmlcharrefreplace'))
                     count -= 1
                 if count == 0:
                     if not in_censorship:
@@ -841,24 +840,7 @@ class LitFile(object):
         if len(attrs) != nentries:
             self._warn("damaged or invalid atoms attributes table")
         return (tags, attrs)
-    
-    def get_entry_content(self, entry, pretty_print=False):
-        if 'spine' in entry.state:
-            name = '/'.join(('/data', entry.internal, 'content'))
-            path = entry.path
-            raw = self.get_file(name)
-            decl, map = (OPF_DECL, OPF_MAP) \
-                if name == '/meta' else (HTML_DECL, HTML_MAP)
-            atoms = self.get_atoms(entry)
-            content = decl + unicode(UnBinary(raw, path, self.manifest, map, atoms))
-            if pretty_print:
-                content = self._pretty_print(content)
-            content = content.encode('utf-8')
-        else:
-            internal = '/'.join(('/data', entry.internal))
-            content = self._litfile.get_file(internal)
-        return content
- 
+
 
 class LitContainer(object):
     """Simple Container-interface, read-only accessor for LIT files."""
@@ -879,9 +861,15 @@ class LitContainer(object):
         elif 'spine' in entry.state:
             internal = '/'.join(('/data', entry.internal, 'content'))
             raw = self._litfile.get_file(internal)
-            unbin = UnBinary(raw, name, self._litfile.manifest, HTML_MAP)
+            manifest = self._litfile.manifest
+            atoms = self._litfile.get_atoms(entry)
+            unbin = UnBinary(raw, name, manifest, HTML_MAP, atoms)
             content = HTML_DECL + str(unbin)
-   
+        else:
+            internal = '/'.join(('/data', entry.internal))
+            content = self._litfile.get_file(internal)
+        return content
+    
     def _read_meta(self):
         path = 'content.opf'
         raw = self._litfile.get_file('/meta')
diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py
index bebba8938b..73216057b5 100644
--- a/src/calibre/ebooks/lit/writer.py
+++ b/src/calibre/ebooks/lit/writer.py
@@ -27,7 +27,7 @@ from calibre.ebooks.oeb.base import OEB_DOCS, XHTML_MIME, OEB_STYLES, \
     CSS_MIME, OPF_MIME, XML_NS, XML
 from calibre.ebooks.oeb.base import namespace, barename, prefixname, \
     urlnormalize, xpath
-from calibre.ebooks.oeb.base import Logger, OEBBook
+from calibre.ebooks.oeb.base import OEBBook
 from calibre.ebooks.oeb.profile import Context
 from calibre.ebooks.oeb.stylizer import Stylizer
 from calibre.ebooks.oeb.transforms.flatcss import CSSFlattener
@@ -732,7 +732,7 @@ def option_parser():
     return parser
 
 def oeb2lit(opts, inpath):
-    logger = Logger(logging.getLogger('oeb2lit'))
+    logger = logging.getLogger('oeb2lit')
     logger.setup_cli_handler(opts.verbose)
     outpath = opts.output
     if outpath is None:
diff --git a/src/calibre/ebooks/metadata/fetch.py b/src/calibre/ebooks/metadata/fetch.py
index 682291ae48..f950e1282c 100644
--- a/src/calibre/ebooks/metadata/fetch.py
+++ b/src/calibre/ebooks/metadata/fetch.py
@@ -11,7 +11,7 @@ from calibre.utils.config import OptionParser
 
 class FetchGoogle(Thread):
     name = 'Google Books'
-        
+
     def __init__(self, title, author, publisher, isbn, verbose):
         self.title = title
         self.verbose = verbose
@@ -21,17 +21,17 @@ class FetchGoogle(Thread):
         Thread.__init__(self, None)
         self.daemon = True
         self.exception, self.tb = None, None
-        
+
     def run(self):
         from calibre.ebooks.metadata.google_books import search
         try:
-            self.results = search(self.title, self.author, self.publisher, 
-                                  self.isbn, max_results=10, 
+            self.results = search(self.title, self.author, self.publisher,
+                                  self.isbn, max_results=10,
                                   verbose=self.verbose)
         except Exception, e:
             self.results = []
             self.exception = e
-            self.tb = traceback.format_exc() 
+            self.tb = traceback.format_exc()
 
 
 class FetchISBNDB(Thread):
@@ -46,19 +46,21 @@ class FetchISBNDB(Thread):
         self.daemon = True
         self.exception, self.tb = None, None
         self.key = key
-        
+
     def run(self):
         from calibre.ebooks.metadata.isbndb import option_parser, create_books
         args = ['isbndb']
         if self.isbn:
             args.extend(['--isbn', self.isbn])
-        else: 
+        else:
             if self.title:
                 args.extend(['--title', self.title])
             if self.author:
                 args.extend(['--author', self.author])
             if self.publisher:
                 args.extend(['--publisher', self.publisher])
+        if self.verbose:
+            args.extend(['--verbose'])
         args.append(self.key)
         try:
             opts, args = option_parser().parse_args(args)
@@ -75,7 +77,7 @@ def result_index(source, result):
         if x.isbn == result.isbn:
             return i
     return -1
-    
+
 def merge_results(one, two):
     for x in two:
         idx = result_index(one, x)
@@ -90,42 +92,42 @@ def search(title=None, author=None, publisher=None, isbn=None, isbndb_key=None,
                    isbn is None)
     fetchers = [FetchGoogle(title, author, publisher, isbn, verbose)]
     if isbndb_key:
-        fetchers.append(FetchISBNDB(title, author, publisher, isbn, verbose, 
+        fetchers.append(FetchISBNDB(title, author, publisher, isbn, verbose,
                                         isbndb_key))
-        
-    
+
+
     for fetcher in fetchers:
         fetcher.start()
     for fetcher in fetchers:
         fetcher.join()
     for fetcher in fetchers[1:]:
         merge_results(fetchers[0].results, fetcher.results)
-        
+
     results = sorted(fetchers[0].results, cmp=lambda x, y : cmp(
             (x.comments.strip() if x.comments else ''),
             (y.comments.strip() if y.comments else '')
                                                   ), reverse=True)
-    
+
     return results, [(x.name, x.exception, x.tb) for x in fetchers]
 
-        
+
 def option_parser():
     parser = OptionParser(textwrap.dedent(
         '''\
         %prog [options]
-        
-        Fetch book metadata from online sources. You must specify at least one 
-        of title, author, publisher or ISBN. If you specify ISBN, the others 
-        are ignored.  
+
+        Fetch book metadata from online sources. You must specify at least one
+        of title, author, publisher or ISBN. If you specify ISBN, the others
+        are ignored.
         '''
     ))
     parser.add_option('-t', '--title', help='Book title')
     parser.add_option('-a', '--author', help='Book author(s)')
     parser.add_option('-p', '--publisher', help='Book publisher')
     parser.add_option('-i', '--isbn', help='Book ISBN')
-    parser.add_option('-m', '--max-results', default=10, 
+    parser.add_option('-m', '--max-results', default=10,
                       help='Maximum number of results to fetch')
-    parser.add_option('-k', '--isbndb-key', 
+    parser.add_option('-k', '--isbndb-key',
                       help=('The access key for your ISBNDB.com account. '
                       'Only needed if you want to search isbndb.com'))
     parser.add_option('-v', '--verbose', default=0, action='count',
@@ -135,19 +137,19 @@ def option_parser():
 def main(args=sys.argv):
     parser = option_parser()
     opts, args = parser.parse_args(args)
-    results, exceptions = search(opts.title, opts.author, opts.publisher, 
+    results, exceptions = search(opts.title, opts.author, opts.publisher,
                                  opts.isbn, opts.isbndb_key, opts.verbose)
     for result in results:
         print unicode(result).encode(preferred_encoding)
         print
-        
+
     for name, exception, tb in exceptions:
         if exception is not None:
             print 'WARNING: Fetching from', name, 'failed with error:'
             print exception
             print tb
-            
+
     return 0
-    
+
 if __name__ == '__main__':
-    sys.exit(main())
\ No newline at end of file
+    sys.exit(main())
diff --git a/src/calibre/ebooks/metadata/google_books.py b/src/calibre/ebooks/metadata/google_books.py
index 176692f66c..a2eaf6cae4 100644
--- a/src/calibre/ebooks/metadata/google_books.py
+++ b/src/calibre/ebooks/metadata/google_books.py
@@ -42,9 +42,9 @@ def report(verbose):
 
 
 class Query(object):
-    
+
     BASE_URL = 'http://books.google.com/books/feeds/volumes?'
-    
+
     def __init__(self, title=None, author=None, publisher=None, isbn=None,
                  max_results=20, min_viewability='none', start_index=1):
         assert not(title is None and author is None and publisher is None and \
@@ -60,17 +60,19 @@ class Query(object):
             if title is not None:
                 q += build_term('title', title.split())
             if author is not None:
-                q += build_term('author', author.split())
+                q += ('+' if q else '')+build_term('author', author.split())
             if publisher is not None:
-                q += build_term('publisher', publisher.split())
-        
+                q += ('+' if q else '')+build_term('publisher', publisher.split())
+
+        if isinstance(q, unicode):
+            q = q.encode('utf-8')
         self.url = self.BASE_URL+urlencode({
             'q':q,
             'max-results':max_results,
             'start-index':start_index,
             'min-viewability':min_viewability,
             })
-        
+
     def __call__(self, browser, verbose):
         if verbose:
             print 'Query:', self.url
@@ -85,7 +87,7 @@ class Query(object):
 
 
 class ResultList(list):
-    
+
     def get_description(self, entry, verbose):
         try:
             desc = description(entry)
@@ -93,7 +95,7 @@ class ResultList(list):
                 return 'SUMMARY:\n'+desc[0].text
         except:
             report(verbose)
-    
+
     def get_language(self, entry, verbose):
         try:
             l = language(entry)
@@ -101,27 +103,27 @@ class ResultList(list):
                 return l[0].text
         except:
             report(verbose)
-    
-                
-    
+
+
+
     def get_title(self, entry):
         candidates = [x.text for x in title(entry)]
         candidates.sort(cmp=lambda x,y: cmp(len(x), len(y)), reverse=True)
         return candidates[0]
-    
+
     def get_authors(self, entry):
         m = creator(entry)
         if not m:
             m = []
         m = [x.text for x in m]
         return m
-    
+
     def get_author_sort(self, entry, verbose):
         for x in creator(entry):
             for key, val in x.attrib.items():
                 if key.endswith('file-as'):
                     return val
-    
+
     def get_identifiers(self, entry, mi):
         isbns = []
         for x in identifier(entry):
@@ -131,7 +133,7 @@ class ResultList(list):
                     isbns.append(t[5:])
         if isbns:
             mi.isbn = sorted(isbns, cmp=lambda x,y:cmp(len(x), len(y)))[-1]
-    
+
     def get_tags(self, entry, verbose):
         try:
             tags = [x.text for x in subject(entry)]
@@ -139,14 +141,14 @@ class ResultList(list):
             report(verbose)
             tags = []
         return tags
-    
+
     def get_publisher(self, entry, verbose):
         try:
             pub = publisher(entry)[0].text
         except:
             pub = None
         return pub
-    
+
     def get_date(self, entry, verbose):
         try:
             d = date(entry)
@@ -158,7 +160,7 @@ class ResultList(list):
             report(verbose)
             d = None
         return d
-    
+
     def populate(self, entries, browser, verbose=False):
         for x in entries:
             try:
@@ -175,7 +177,7 @@ class ResultList(list):
                 if verbose:
                     print 'Failed to get all details for an entry'
                     print e
-            mi.author_sort = self.get_author_sort(x, verbose) 
+            mi.author_sort = self.get_author_sort(x, verbose)
             mi.comments = self.get_description(x, verbose)
             self.get_identifiers(x, mi)
             mi.tags = self.get_tags(x, verbose)
@@ -190,14 +192,14 @@ def search(title=None, author=None, publisher=None, isbn=None,
     br   = browser()
     start, entries = 1, []
     while start > 0 and len(entries) <= max_results:
-        new, start = Query(title=title, author=author, publisher=publisher, 
+        new, start = Query(title=title, author=author, publisher=publisher,
                        isbn=isbn, min_viewability=min_viewability)(br, verbose)
         if not new:
             break
         entries.extend(new)
-    
+
     entries = entries[:max_results]
-    
+
     ans = ResultList()
     ans.populate(entries, br, verbose)
     return ans
@@ -206,18 +208,18 @@ def option_parser():
     parser = OptionParser(textwrap.dedent(
         '''\
         %prog [options]
-        
+
         Fetch book metadata from Google. You must specify one of title, author,
-        publisher or ISBN. If you specify ISBN the others are ignored. Will 
-        fetch a maximum of 100 matches, so you should make your query as 
-        specific as possible. 
+        publisher or ISBN. If you specify ISBN the others are ignored. Will
+        fetch a maximum of 100 matches, so you should make your query as
+        specific as possible.
         '''
     ))
     parser.add_option('-t', '--title', help='Book title')
     parser.add_option('-a', '--author', help='Book author(s)')
     parser.add_option('-p', '--publisher', help='Book publisher')
     parser.add_option('-i', '--isbn', help='Book ISBN')
-    parser.add_option('-m', '--max-results', default=10, 
+    parser.add_option('-m', '--max-results', default=10,
                       help='Maximum number of results to fetch')
     parser.add_option('-v', '--verbose', default=0, action='count',
                       help='Be more verbose about errors')
@@ -236,6 +238,6 @@ def main(args=sys.argv):
     for result in results:
         print unicode(result).encode(preferred_encoding)
         print
-    
+
 if __name__ == '__main__':
-    sys.exit(main())
\ No newline at end of file
+    sys.exit(main())
diff --git a/src/calibre/ebooks/metadata/isbndb.py b/src/calibre/ebooks/metadata/isbndb.py
index da4dcc6253..7ab2f16949 100644
--- a/src/calibre/ebooks/metadata/isbndb.py
+++ b/src/calibre/ebooks/metadata/isbndb.py
@@ -8,7 +8,7 @@ import sys, re, socket
 from urllib import urlopen, quote
 
 from calibre.utils.config import OptionParser
-from calibre.ebooks.metadata import MetaInformation, authors_to_sort_string
+from calibre.ebooks.metadata import MetaInformation
 from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup
 
 BASE_URL = 'http://isbndb.com/api/books.xml?access_key=%(key)s&page_number=1&results=subjects,authors,texts&'
@@ -28,7 +28,8 @@ def fetch_metadata(url, max=100, timeout=5.):
                 raw = urlopen(url).read()
             except Exception, err:
                 raise ISBNDBError('Could not fetch ISBNDB metadata. Error: '+str(err))
-            soup = BeautifulStoneSoup(raw)
+            soup = BeautifulStoneSoup(raw,
+                    convertEntities=BeautifulStoneSoup.XML_ENTITIES)
             book_list = soup.find('booklist')
             if book_list is None:
                 errmsg = soup.find('errormessage').string
@@ -41,13 +42,13 @@ def fetch_metadata(url, max=100, timeout=5.):
         return books
     finally:
         socket.setdefaulttimeout(timeout)
-    
+
 
 class ISBNDBMetadata(MetaInformation):
-    
+
     def __init__(self, book):
         MetaInformation.__init__(self, None, [])
-        
+
         self.isbn = book['isbn']
         self.title = book.find('titlelong').string
         if not self.title:
@@ -59,7 +60,7 @@ class ISBNDBMetadata(MetaInformation):
         for au in temp:
             if not au: continue
             self.authors.extend([a.strip() for a in au.split('&amp;')])
-            
+
         try:
             self.author_sort = book.find('authors').find('person').string
             if self.authors and self.author_sort == self.authors[0]:
@@ -67,12 +68,12 @@ class ISBNDBMetadata(MetaInformation):
         except:
             pass
         self.publisher = book.find('publishertext').string
-        
+
         summ = book.find('summary')
         if summ and hasattr(summ, 'string') and summ.string:
             self.comments = 'SUMMARY:\n'+summ.string
-        
-        
+
+
 
 def build_isbn(base_url, opts):
     return base_url + 'index1=isbn&value1='+opts.isbn
@@ -85,11 +86,11 @@ def build_combined(base_url, opts):
     query = query.strip()
     if len(query) == 0:
         raise ISBNDBError('You must specify at least one of --author, --title or --publisher')
-    
+
     query = re.sub(r'\s+', '+', query)
     if isinstance(query, unicode):
         query = query.encode('utf-8')
-    return base_url+'index1=combined&value1='+quote(query, '+')    
+    return base_url+'index1=combined&value1='+quote(query, '+')
 
 
 def option_parser():
@@ -97,7 +98,7 @@ def option_parser():
 _('''
 %prog [options] key
 
-Fetch metadata for books from isndb.com. You can specify either the 
+Fetch metadata for books from isndb.com. You can specify either the
 books ISBN ID or its title and author. If you specify the title and author,
 then more than one book may be returned.
 
@@ -112,11 +113,11 @@ key is the account key you generate after signing up for a free account from isb
                       default=None, help=_('The title of the book to search for.'))
     parser.add_option('-p', '--publisher', default=None, dest='publisher',
                       help=_('The publisher of the book to search for.'))
-    parser.add_option('-v', '--verbose', default=False, 
+    parser.add_option('-v', '--verbose', default=False,
                       action='store_true', help=_('Verbose processing'))
-    
+
     return parser
-    
+
 
 def create_books(opts, args, timeout=5.):
     base_url = BASE_URL%dict(key=args[1])
@@ -124,10 +125,10 @@ def create_books(opts, args, timeout=5.):
         url = build_isbn(base_url, opts)
     else:
         url = build_combined(base_url, opts)
-    
+
     if opts.verbose:
         print ('ISBNDB query: '+url)
-    
+
     return [ISBNDBMetadata(book) for book in fetch_metadata(url, timeout=timeout)]
 
 def main(args=sys.argv):
@@ -137,10 +138,10 @@ def main(args=sys.argv):
         parser.print_help()
         print ('You must supply the isbndb.com key')
         return 1
-    
+
     for book in create_books(opts, args):
         print unicode(book).encode('utf-8')
-            
+
     return 0
 
 if __name__ == '__main__':
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 74b6804845..24e5dd83fc 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -258,6 +258,11 @@ class Manifest(ResourceCollection):
             if i.id == id:
                 return i.path
 
+    def type_for_id(self, id):
+        for i in self:
+            if i.id == id:
+                return i.mime_type
+
 class Spine(ResourceCollection):
 
     class Item(Resource):
@@ -444,7 +449,7 @@ class OPF(object):
         if not hasattr(stream, 'read'):
             stream = open(stream, 'rb')
         self.basedir  = self.base_dir = basedir
-        self.path_to_html_toc = None
+        self.path_to_html_toc = self.html_toc_fragment = None
         raw, self.encoding = xml_to_unicode(stream.read(), strip_encoding_pats=True, resolve_entities=True)
         raw = raw[raw.find('<'):]
         self.root     = etree.fromstring(raw, self.PARSER)
@@ -487,7 +492,10 @@ class OPF(object):
 
             if toc is None: return
             self.toc = TOC(base_path=self.base_dir)
-            if toc.lower() in ('ncx', 'ncxtoc'):
+            is_ncx = getattr(self, 'manifest', None) is not None and \
+                     self.manifest.type_for_id(toc) is not None and \
+                     'dtbncx' in self.manifest.type_for_id(toc)
+            if is_ncx or toc.lower() in ('ncx', 'ncxtoc'):
                 path = self.manifest.path_for_id(toc)
                 if path:
                     self.toc.read_ncx_toc(path)
@@ -496,7 +504,8 @@ class OPF(object):
                     if f:
                         self.toc.read_ncx_toc(f[0])
             else:
-                self.path_to_html_toc = toc
+                self.path_to_html_toc, self.html_toc_fragment = \
+                    toc.partition('#')[0], toc.partition('#')[-1]
                 self.toc.read_html_toc(toc)
         except:
             pass
@@ -627,7 +636,7 @@ class OPF(object):
                 attrib = {'{%s}role'%self.NAMESPACES['opf']: 'aut'}
                 elem = self.create_metadata_element('creator', attrib=attrib)
                 self.set_text(elem, author.strip())
-            
+
         return property(fget=fget, fset=fset)
 
     @dynamic_property
diff --git a/src/calibre/ebooks/mobi/input.py b/src/calibre/ebooks/mobi/input.py
index b3400c54e1..8f2e24a831 100644
--- a/src/calibre/ebooks/mobi/input.py
+++ b/src/calibre/ebooks/mobi/input.py
@@ -6,25 +6,28 @@ __docformat__ = 'restructuredtext en'
 from calibre.customize.conversion import InputFormatPlugin
 
 class MOBIInput(InputFormatPlugin):
-    
+
     name        = 'MOBI Input'
     author      = 'Kovid Goyal'
     description = 'Convert MOBI files (.mobi, .prc, .azw) to HTML'
     file_types  = set(['mobi', 'prc', 'azw'])
-    
-    def convert(self, stream, options, file_ext, parse_cache, log, 
+
+    def convert(self, stream, options, file_ext, log,
                 accelerators):
         from calibre.ebooks.mobi.reader import MobiReader
-        mr = MobiReader(stream, log, options.input_encoding, 
+        from lxml import html
+        mr = MobiReader(stream, log, options.input_encoding,
                         options.debug_input)
+        parse_cache = {}
         mr.extract_content('.', parse_cache)
-        raw = parse_cache.get('calibre_raw_mobi_markup', False)
+        raw = parse_cache.pop('calibre_raw_mobi_markup', False)
         if raw:
             if isinstance(raw, unicode):
                 raw = raw.encode('utf-8')
             open('debug-raw.html', 'wb').write(raw)
         for f, root in parse_cache.items():
-            if '.' in f:
-                accelerators[f] = {'pagebreaks':root.xpath(
-                                            '//div[@class="mbp_pagebreak"]')}
-        return mr.created_opf_path
\ No newline at end of file
+            with open(f, 'wb') as q:
+                q.write(html.tostring(root, encoding='utf-8', method='xml',
+                    include_meta_content_type=False))
+            accelerators['pagebreaks'] = {f: '//div[@class="mbp_pagebreak"]'}
+        return mr.created_opf_path
diff --git a/src/calibre/ebooks/mobi/mobiml.py b/src/calibre/ebooks/mobi/mobiml.py
index 850fe20429..18f53317e0 100644
--- a/src/calibre/ebooks/mobi/mobiml.py
+++ b/src/calibre/ebooks/mobi/mobiml.py
@@ -79,7 +79,7 @@ class FormatState(object):
 class MobiMLizer(object):
     def __init__(self, ignore_tables=False):
         self.ignore_tables = ignore_tables
-    
+
     @classmethod
     def config(cls, cfg):
         group = cfg.add_group('mobiml', _('Mobipocket markup options.'))
@@ -92,7 +92,7 @@ class MobiMLizer(object):
     @classmethod
     def generate(cls, opts):
         return cls(ignore_tables=opts.ignore_tables)
-    
+
     def __call__(self, oeb, context):
         oeb.logger.info('Converting XHTML to Mobipocket markup...')
         self.oeb = oeb
@@ -111,10 +111,10 @@ class MobiMLizer(object):
         del oeb.guide['cover']
         item = oeb.manifest.hrefs[href]
         if item.spine_position is not None:
-            oeb.spine.remove(item)                
+            oeb.spine.remove(item)
             if item.media_type in OEB_DOCS:
                 self.oeb.manifest.remove(item)
-    
+
     def mobimlize_spine(self):
         for item in self.oeb.spine:
             stylizer = Stylizer(item.data, item.href, self.oeb, self.profile)
@@ -147,7 +147,7 @@ class MobiMLizer(object):
             if line:
                 result.append(line)
         return result
-    
+
     def mobimlize_content(self, tag, text, bstate, istates):
         if text or tag != 'br':
             bstate.content = True
@@ -252,7 +252,7 @@ class MobiMLizer(object):
                     last.tail = (last.tail or '') + item
             else:
                 inline.append(item)
-    
+
     def mobimlize_elem(self, elem, stylizer, bstate, istates):
         if not isinstance(elem.tag, basestring) \
            or namespace(elem.tag) != XHTML_NS:
diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index 3b9085adca..32e0126b12 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -5,10 +5,11 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 Read data from .mobi files
 '''
 
-import struct, os, cStringIO, re, functools
+import struct, os, cStringIO, re, functools, datetime
 
 try:
     from PIL import Image as PILImage
+    PILImage
 except ImportError:
     import Image as PILImage
 
@@ -27,7 +28,7 @@ from calibre.ebooks.metadata.toc import TOC
 from calibre import sanitize_file_name
 
 class EXTHHeader(object):
-    
+
     def __init__(self, raw, codec, title):
         self.doctype = raw[:4]
         self.length, self.num_items = struct.unpack('>LL', raw[4:12])
@@ -36,7 +37,7 @@ class EXTHHeader(object):
         self.mi = MetaInformation(_('Unknown'), [_('Unknown')])
         self.has_fake_cover = True
         left = self.num_items
-        
+
         while left > 0:
             left -= 1
             id, size = struct.unpack('>LL', raw[pos:pos+8])
@@ -45,18 +46,26 @@ class EXTHHeader(object):
             if id >= 100 and id < 200:
                 self.process_metadata(id, content, codec)
             elif id == 203:
-                self.has_fake_cover = bool(struct.unpack('>L', content)[0]) 
+                self.has_fake_cover = bool(struct.unpack('>L', content)[0])
             elif id == 201:
                 co, = struct.unpack('>L', content)
                 if co < 1e7:
-                    self.cover_offset = co 
+                    self.cover_offset = co
             elif id == 202:
                 self.thumbnail_offset, = struct.unpack('>L', content)
+            elif id == 501:
+                # cdetype
+                pass
+            elif id == 502:
+                # last update time
+                pass
+            elif id == 503 and (not title or title == _('Unknown')):
+                title = content
             #else:
             #    print 'unknown record', id, repr(content)
         if title:
             self.mi.title = title
-    
+
     def process_metadata(self, id, content, codec):
         if id == 100:
             if self.mi.authors == [_('Unknown')]:
@@ -72,12 +81,18 @@ class EXTHHeader(object):
             if not self.mi.tags:
                 self.mi.tags = []
             self.mi.tags.append(content.decode(codec, 'ignore'))
+        elif id == 106:
+            try:
+                self.mi.publish_date = datetime.datetime.strptime(
+                        content, '%Y-%m-%d',).date()
+            except:
+                pass
         #else:
-        #    print 'unhandled metadata record', id, repr(content), codec 
-            
+        #    print 'unhandled metadata record', id, repr(content)
+
 
 class BookHeader(object):
-    
+
     def __init__(self, raw, ident, user_encoding, log):
         self.log = log
         self.compression_type = raw[:2]
@@ -99,8 +114,8 @@ class BookHeader(object):
             self.doctype = raw[16:20]
             self.length, self.type, self.codepage, self.unique_id, \
                 self.version = struct.unpack('>LLLLL', raw[20:40])
-                    
-            
+
+
             try:
                 self.codec = {
                           1252  : 'cp1252',
@@ -110,15 +125,14 @@ class BookHeader(object):
                 self.codec = 'cp1252' if user_encoding is None else user_encoding
                 log.warn('Unknown codepage %d. Assuming %s'%(self.codepage,
                                                             self.codec))
-            
             if ident == 'TEXTREAD' or self.length < 0xE4 or 0xE8 < self.length:
                 self.extra_flags = 0
             else:
                 self.extra_flags, = struct.unpack('>H', raw[0xF2:0xF4])
-            
+
             if self.compression_type == 'DH':
-                self.huff_offset, self.huff_number = struct.unpack('>LL', raw[0x70:0x78]) 
-            
+                self.huff_offset, self.huff_number = struct.unpack('>LL', raw[0x70:0x78])
+
             toff, tlen = struct.unpack('>II', raw[0x54:0x5c])
             tend = toff + tlen
             self.title = raw[toff:tend] if tend < len(raw) else _('Unknown')
@@ -129,7 +143,7 @@ class BookHeader(object):
             self.sublanguage = sub_language.get(sublangid, 'NEUTRAL')
             self.mobi_version = struct.unpack('>I', raw[0x68:0x6c])[0]
             self.first_image_index = struct.unpack('>L', raw[0x6c:0x6c+4])[0]
-            
+
             self.exth_flag, = struct.unpack('>L', raw[0x80:0x84])
             self.exth = None
             if not isinstance(self.title, unicode):
@@ -138,54 +152,54 @@ class BookHeader(object):
                 self.exth = EXTHHeader(raw[16+self.length:], self.codec, self.title)
                 self.exth.mi.uid = self.unique_id
                 self.exth.mi.language = self.language
-            
+
 
 class MobiReader(object):
     PAGE_BREAK_PAT = re.compile(r'(<[/]{0,1}mbp:pagebreak\s*[/]{0,1}>)+', re.IGNORECASE)
     IMAGE_ATTRS = ('lowrecindex', 'recindex', 'hirecindex')
-    
+
     def __init__(self, filename_or_stream, log, user_encoding=None, debug=None):
         self.log = log
         self.debug = debug
         self.embedded_mi = None
         self.base_css_rules = '''
                 blockquote { margin: 0em 0em 0em 1.25em; text-align: justify }
-                
+
                 p { margin: 0em; text-align: justify }
-                
+
                 .bold { font-weight: bold }
-                
+
                 .italic { font-style: italic }
-                
+
                 .mbp_pagebreak {
                     page-break-after: always; margin: 0; display: block
                 }
                 '''
         self.tag_css_rules = []
-        
+
         if hasattr(filename_or_stream, 'read'):
             stream = filename_or_stream
             stream.seek(0)
         else:
             stream = open(filename_or_stream, 'rb')
-            
+
         raw = stream.read()
-        
+
         self.header   = raw[0:72]
         self.name     = self.header[:32].replace('\x00', '')
         self.num_sections, = struct.unpack('>H', raw[76:78])
-        
+
         self.ident = self.header[0x3C:0x3C+8].upper()
         if self.ident not in ['BOOKMOBI', 'TEXTREAD']:
-            raise MobiError('Unknown book type: %s'%self.ident) 
-        
+            raise MobiError('Unknown book type: %s'%self.ident)
+
         self.sections = []
         self.section_headers = []
         for i in range(self.num_sections):
             offset, a1, a2, a3, a4 = struct.unpack('>LBBBB', raw[78+i*8:78+i*8+8])
             flags, val = a1, a2<<16 | a3<<8 | a4
             self.section_headers.append((offset, flags, val))
-        
+
         def section(section_number):
             if section_number == self.num_sections - 1:
                 end_off = len(raw)
@@ -193,20 +207,20 @@ class MobiReader(object):
                 end_off = self.section_headers[section_number + 1][0]
             off = self.section_headers[section_number][0]
             return raw[off:end_off]
-            
+
         for i in range(self.num_sections):
-            self.sections.append((section(i), self.section_headers[i])) 
-         
-            
-        self.book_header = BookHeader(self.sections[0][0], self.ident, 
+            self.sections.append((section(i), self.section_headers[i]))
+
+
+        self.book_header = BookHeader(self.sections[0][0], self.ident,
                                       user_encoding, self.log)
         self.name = self.name.decode(self.book_header.codec, 'replace')
-        
+
     def extract_content(self, output_dir, parse_cache):
         output_dir = os.path.abspath(output_dir)
         if self.book_header.encryption_type != 0:
             raise DRMError(self.name)
-        
+
         processed_records = self.extract_text()
         if self.debug is not None:
             self.parse_cache['calibre_raw_mobi_markup'] = self.mobi_html
@@ -215,14 +229,14 @@ class MobiReader(object):
                                                           'ignore')
         for pat in ENCODING_PATS:
             self.processed_html = pat.sub('', self.processed_html)
-        e2u = functools.partial(entity_to_unicode, 
+        e2u = functools.partial(entity_to_unicode,
                                 exceptions=['lt', 'gt', 'amp', 'apos', 'quot'])
         self.processed_html = re.sub(r'&(\S+?);', e2u,
                                      self.processed_html)
         self.extract_images(processed_records, output_dir)
         self.replace_page_breaks()
         self.cleanup_html()
-        
+
         if self.processed_html.startswith('<body'):
             self.processed_html = '<html><head></head>'+self.processed_html+'</html>'
         self.processed_html = \
@@ -230,7 +244,7 @@ class MobiReader(object):
                 '\n<head>\n'
                 '\t<link type="text/css" href="styles.css" />\n',
                 self.processed_html)
-        
+
         self.log.debug('Parsing HTML...')
         root = html.fromstring(self.processed_html)
         self.upshift_markup(root)
@@ -241,7 +255,7 @@ class MobiReader(object):
             self.read_embedded_metadata(root, metadata_elems[0], guide)
         for elem in guides + metadata_elems:
             elem.getparent().remove(elem)
-        htmlfile = os.path.join(output_dir, 
+        htmlfile = os.path.join(output_dir,
                                 sanitize_file_name(self.name)+'.html')
         try:
             for ref in guide.xpath('descendant::reference'):
@@ -254,19 +268,30 @@ class MobiReader(object):
         self.log.debug('Creating OPF...')
         ncx = cStringIO.StringIO()
         opf = self.create_opf(htmlfile, guide, root)
-        self.created_opf_path = os.path.splitext(htmlfile)[0]+'.opf' 
+        self.created_opf_path = os.path.splitext(htmlfile)[0]+'.opf'
         opf.render(open(self.created_opf_path, 'wb'), ncx)
         ncx = ncx.getvalue()
         if ncx:
             open(os.path.splitext(htmlfile)[0]+'.ncx', 'wb').write(ncx)
-                
+
         with open('styles.css', 'wb') as s:
             s.write(self.base_css_rules+'\n\n')
             for rule in self.tag_css_rules:
                 if isinstance(rule, unicode):
                     rule = rule.encode('utf-8')
                 s.write(rule+'\n\n')
-    
+
+
+        if self.book_header.exth is not None or self.embedded_mi is not None:
+            if self.verbose:
+                print 'Creating OPF...'
+            ncx = cStringIO.StringIO()
+            opf = self.create_opf(htmlfile, guide, root)
+            opf.render(open(os.path.splitext(htmlfile)[0]+'.opf', 'wb'), ncx)
+            ncx = ncx.getvalue()
+            if ncx:
+                open(os.path.splitext(htmlfile)[0]+'.ncx', 'wb').write(ncx)
+
     def read_embedded_metadata(self, root, elem, guide):
         raw = '<package>'+html.tostring(elem, encoding='utf-8')+'</package>'
         stream = cStringIO.StringIO(raw)
@@ -291,7 +316,7 @@ class MobiReader(object):
                                 elem.getparent().remove(elem)
                                 break
                     break
-    
+
     def cleanup_html(self):
         self.log.debug('Cleaning up HTML...')
         self.processed_html = re.sub(r'<div height="0(pt|px|ex|em|%){0,1}"></div>', '', self.processed_html)
@@ -299,7 +324,7 @@ class MobiReader(object):
             self.processed_html = '<html><p>'+self.processed_html.replace('\n\n', '<p>')+'</html>'
         self.processed_html = self.processed_html.replace('\r\n', '\n')
         self.processed_html = self.processed_html.replace('> <', '>\n<')
-        
+
     def upshift_markup(self, root):
         self.log.debug('Converting style information to CSS...')
         size_map = {
@@ -314,8 +339,8 @@ class MobiReader(object):
         mobi_version = self.book_header.mobi_version
         for i, tag in enumerate(root.iter(etree.Element)):
             if tag.tag in ('country-region', 'place', 'placetype', 'placename',
-                           'state', 'city', 'street', 'address'):
-                tag.tag = 'span'
+                           'state', 'city', 'street', 'address', 'content'):
+                tag.tag = 'div' if tag.tag == 'content' else 'span'
                 for key in tag.attrib.keys():
                     tag.attrib.pop(key)
                 continue
@@ -366,22 +391,22 @@ class MobiReader(object):
             elif tag.tag == 'pre':
                 if not tag.text:
                     tag.tag = 'div'
-            
+
             if 'filepos-id' in attrib:
                 attrib['id'] = attrib.pop('filepos-id')
+                if 'name' in attrib and attrib['name'] != attrib['id']:
+                    attrib['name'] = attrib['id']
             if 'filepos' in attrib:
                 filepos = attrib.pop('filepos')
                 try:
                     attrib['href'] = "#filepos%d" % int(filepos)
                 except ValueError:
                     pass
-            
             if styles:
                 attrib['id'] = attrib.get('id', 'calibre_mr_gid%d'%i)
-                self.tag_css_rules.append('#%s {%s}'%(attrib['id'], 
+                self.tag_css_rules.append('#%s {%s}'%(attrib['id'],
                                                       '; '.join(styles)))
-    
-    
+
     def create_opf(self, htmlfile, guide=None, root=None):
         mi = getattr(self.book_header.exth, 'mi', self.embedded_mi)
         if mi is None:
@@ -402,7 +427,7 @@ class MobiReader(object):
         bp = os.path.dirname(htmlfile)
         for i in getattr(self, 'image_names', []):
             manifest.append((os.path.join(bp, 'images/', i), 'image/jpeg'))
-        
+
         opf.create_manifest(manifest)
         opf.create_spine([os.path.basename(htmlfile)])
         toc = None
@@ -431,16 +456,16 @@ class MobiReader(object):
                             except:
                                 text = ''
                             text = ent_pat.sub(entity_to_unicode, text)
-                            tocobj.add_item(toc.partition('#')[0], href[1:], 
+                            tocobj.add_item(toc.partition('#')[0], href[1:],
                                             text)
                     if reached and x.get('class', None) == 'mbp_pagebreak':
                         break
             if tocobj is not None:
                 opf.set_toc(tocobj)
-        
+
         return opf
-        
-        
+
+
     def sizeof_trailing_entries(self, data):
         def sizeof_trailing_entry(ptr, psize):
             bitpos, result = 0, 0
@@ -451,7 +476,7 @@ class MobiReader(object):
                 psize -= 1
                 if (v & 0x80) != 0 or (bitpos >= 28) or (psize == 0):
                     return result
-        
+
         num = 0
         size = len(data)
         flags = self.book_header.extra_flags >> 1
@@ -467,27 +492,27 @@ class MobiReader(object):
         data = self.sections[index][0]
         trail_size = self.sizeof_trailing_entries(data)
         return data[:len(data)-trail_size]
-    
+
     def extract_text(self):
         self.log.debug('Extracting text...')
         text_sections = [self.text_section(i) for i in range(1, self.book_header.records+1)]
         processed_records = list(range(0, self.book_header.records+1))
-        
+
         self.mobi_html = ''
-        
+
         if self.book_header.compression_type == 'DH':
-            huffs = [self.sections[i][0] for i in 
-                  range(self.book_header.huff_offset, 
+            huffs = [self.sections[i][0] for i in
+                  range(self.book_header.huff_offset,
                         self.book_header.huff_offset+self.book_header.huff_number)]
-            processed_records += list(range(self.book_header.huff_offset, 
+            processed_records += list(range(self.book_header.huff_offset,
                         self.book_header.huff_offset+self.book_header.huff_number))
             huff = HuffReader(huffs)
             self.mobi_html = huff.decompress(text_sections)
-        
+
         elif self.book_header.compression_type == '\x00\x02':
             for section in text_sections:
                 self.mobi_html += decompress_doc(section)
-        
+
         elif self.book_header.compression_type == '\x00\x01':
             self.mobi_html = ''.join(text_sections)
         else:
@@ -495,13 +520,13 @@ class MobiReader(object):
         if self.book_header.ancient and '<html' not in self.mobi_html[:300].lower():
             self.mobi_html = self.mobi_html.replace('\r ', '\n\n ')
         return processed_records
-            
-    
+
+
     def replace_page_breaks(self):
         self.processed_html = self.PAGE_BREAK_PAT.sub(
             '<div class="mbp_pagebreak" />',
             self.processed_html)
-    
+
     def add_anchors(self):
         self.log.debug('Adding anchors...')
         positions = set([])
@@ -530,8 +555,8 @@ class MobiReader(object):
             self.processed_html += self.mobi_html[pos:end] + (anchor % oend)
             pos = end
         self.processed_html += self.mobi_html[pos:]
-        
-    
+
+
     def extract_images(self, processed_records, output_dir):
         self.log.debug('Extracting images...')
         output_dir = os.path.abspath(os.path.join(output_dir, 'images'))
@@ -541,7 +566,7 @@ class MobiReader(object):
         self.image_names = []
         start = getattr(self.book_header, 'first_image_index', -1)
         if start > self.num_sections or start < 0:
-            # BAEN PRC files have bad headers 
+            # BAEN PRC files have bad headers
             start=0
         for i in range(start, self.num_sections):
             if i in processed_records:
@@ -551,10 +576,10 @@ class MobiReader(object):
             buf = cStringIO.StringIO(data)
             image_index += 1
             try:
-                im = PILImage.open(buf)                
+                im = PILImage.open(buf)
             except IOError:
                 continue
-             
+
             path = os.path.join(output_dir, '%05d.jpg'%image_index)
             self.image_names.append(os.path.basename(path))
             im.convert('RGB').save(open(path, 'wb'), format='JPEG')
@@ -583,3 +608,4 @@ def get_metadata(stream):
             log.exception()
     return mi
 
+
diff --git a/src/calibre/ebooks/mobi/writer.py b/src/calibre/ebooks/mobi/writer.py
index d3ab12489c..39aea3fa30 100644
--- a/src/calibre/ebooks/mobi/writer.py
+++ b/src/calibre/ebooks/mobi/writer.py
@@ -132,7 +132,7 @@ def rescale_image(data, maxsizeb, dimen=None):
 
 class Serializer(object):
     NSRMAP = {'': None, XML_NS: 'xml', XHTML_NS: '', MBP_NS: 'mbp'}
-    
+
     def __init__(self, oeb, images):
         self.oeb = oeb
         self.images = images
@@ -192,7 +192,7 @@ class Serializer(object):
         self.href_offsets[href].append(buffer.tell())
         buffer.write('0000000000')
         return True
-        
+
     def serialize_body(self):
         buffer = self.buffer
         self.anchor_offset = buffer.tell()
@@ -211,12 +211,14 @@ class Serializer(object):
 
     def serialize_item(self, item):
         buffer = self.buffer
+        #buffer.write('<mbp:section>')
         if not item.linear:
             self.breaks.append(buffer.tell() - 1)
         self.id_offsets[item.href] = buffer.tell()
         for elem in item.data.find(XHTML('body')):
             self.serialize_elem(elem, item)
-        buffer.write('<mbp:pagebreak/>')
+        #buffer.write('</mbp:section>')
+        buffer.write('</mbp:pagebreak>')
 
     def serialize_elem(self, elem, item, nsrmap=NSRMAP):
         buffer = self.buffer
@@ -305,7 +307,7 @@ class MobiFlattener(object):
             fbase=fbase, fkey=fkey, unfloat=True, untable=True)
         return flattener(oeb, context)
 
-                
+
 class MobiWriter(object):
     COLLAPSE_RE = re.compile(r'[ \t\r\n\v]+')
 
@@ -313,7 +315,7 @@ class MobiWriter(object):
 
     TRANSFORMS = [HTMLTOCAdder, CaseMangler, MobiFlattener(), SVGRasterizer,
                   ManifestTrimmer, MobiMLizer]
-    
+
     def __init__(self, compression=None, imagemax=None,
                  prefer_author_sort=False):
         self._compression = compression or UNCOMPRESSED
@@ -329,7 +331,7 @@ class MobiWriter(object):
         mobi('compress', ['--compress'], default=False,
              help=_('Compress file text using PalmDOC compression. '
                     'Results in smaller files, but takes a long time to run.'))
-        mobi('rescale_images', ['--rescale-images'], default=False, 
+        mobi('rescale_images', ['--rescale-images'], default=False,
              help=_('Modify images to meet Palm device size limitations.'))
         mobi('prefer_author_sort', ['--prefer-author-sort'], default=False,
              help=_('When present, use the author sorting information for '
@@ -344,17 +346,17 @@ class MobiWriter(object):
         prefer_author_sort = opts.prefer_author_sort
         return cls(compression=compression, imagemax=imagemax,
                    prefer_author_sort=prefer_author_sort)
-    
+
     def __call__(self, oeb, path):
         if hasattr(path, 'write'):
             return self._dump_stream(oeb, path)
         with open(path, 'w+b') as stream:
             return self._dump_stream(oeb, stream)
-    
+
     def _write(self, *data):
         for datum in data:
             self._stream.write(datum)
-    
+
     def _tell(self):
         return self._stream.tell()
 
@@ -409,7 +411,7 @@ class MobiWriter(object):
         overlap = text.read(extra)
         text.seek(npos)
         return data, overlap
-                
+
     def _generate_text(self):
         self._oeb.logger.info('Serializing markup content...')
         serializer = Serializer(self._oeb, self._images)
@@ -450,7 +452,7 @@ class MobiWriter(object):
             offset += RECORD_SIZE
             data, overlap = self._read_text_record(text)
         self._text_nrecords = nrecords
-    
+
     def _generate_images(self):
         self._oeb.logger.info('Serializing images...')
         images = [(index, href) for href, index in self._images.items()]
@@ -463,7 +465,7 @@ class MobiWriter(object):
                 self._oeb.logger.warn('Bad image file %r' % item.href)
                 continue
             self._records.append(data)
-    
+
     def _generate_record0(self):
         metadata = self._oeb.metadata
         exth = self._build_exth()
@@ -555,7 +557,7 @@ class MobiWriter(object):
         self._images[href] = index
         self._records.append(data)
         return index
-    
+
     def _write_header(self):
         title = str(self._oeb.metadata.title[0])
         title = re.sub('[^-A-Za-z0-9]+', '_', title)[:32]
@@ -582,7 +584,7 @@ def config(defaults=None):
         c = Config('mobi', desc)
     else:
         c = StringConfig(defaults, desc)
-        
+
     profiles = c.add_group('profiles', _('Device renderer profiles. '
         'Affects conversion of font sizes, image rescaling and rasterization '
         'of tables. Valid profiles are: %s.') % ', '.join(_profiles))
@@ -595,13 +597,13 @@ def config(defaults=None):
     c.add_opt('encoding', ['--encoding'], default=None,
               help=_('Character encoding for HTML files. Default is to auto detect.'))
     return c
-    
+
 
 def option_parser():
     c = config()
     parser = c.option_parser(usage='%prog '+_('[options]')+' file.opf')
     parser.add_option(
-        '-o', '--output', default=None, 
+        '-o', '--output', default=None,
         help=_('Output file. Default is derived from input filename.'))
     parser.add_option(
         '-v', '--verbose', default=0, action='count',
@@ -647,7 +649,7 @@ def oeb2mobi(opts, inpath):
     writer.dump(oeb, outpath)
     run_plugins_on_postprocess(outpath, 'mobi')
     logger.info(_('Output written to ') + outpath)
-    
+
 def main(argv=sys.argv):
     parser = option_parser()
     opts, args = parser.parse_args(argv[1:])
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 59ce1f7b95..4ce984b9a8 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -13,11 +13,15 @@ from collections import defaultdict
 from itertools import count
 from urlparse import urldefrag, urlparse, urlunparse
 from urllib import unquote as urlunquote
+import logging
 from lxml import etree, html
 import calibre
+from cssutils import CSSParser
 from calibre.translations.dynamic import translate
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre.ebooks.oeb.entitydefs import ENTITYDEFS
+from calibre.ebooks.conversion.preprocess import HTMLPreProcessor, \
+        CSSPreProcessor
 
 XML_NS       = 'http://www.w3.org/XML/1998/namespace'
 XHTML_NS     = 'http://www.w3.org/1999/xhtml'
@@ -99,6 +103,8 @@ PNG_MIME       = types_map['.png']
 SVG_MIME       = types_map['.svg']
 BINARY_MIME    = 'application/octet-stream'
 
+XHTML_CSS_NAMESPACE = u'@namespace "%s";\n' % XHTML_NS
+
 OEB_STYLES        = set([CSS_MIME, OEB_CSS_MIME, 'text/x-oeb-css'])
 OEB_DOCS          = set([XHTML_MIME, 'text/html', OEB_DOC_MIME,
                          'text/x-oeb-document'])
@@ -203,6 +209,10 @@ class OEBError(Exception):
     """Generic OEB-processing error."""
     pass
 
+class NotHTML(OEBError):
+    '''Raised when a file that should be HTML (as per manifest) is not'''
+    pass
+
 class NullContainer(object):
     """An empty container.
 
@@ -234,7 +244,7 @@ class DirContainer(object):
         for path in self.namelist():
             ext = os.path.splitext(path)[1].lower()
             if ext == '.opf':
-                self.opfname = fname
+                self.opfname = path
                 return
         self.opfname = None
 
@@ -275,7 +285,7 @@ class Metadata(object):
     syntax.  Return an empty list for any terms with no currently associated
     metadata items.
     """
-    
+
     DC_TERMS      = set(['contributor', 'coverage', 'creator', 'date',
                          'description', 'format', 'identifier', 'language',
                          'publisher', 'relation', 'rights', 'source',
@@ -284,7 +294,10 @@ class Metadata(object):
     OPF_ATTRS     = {'role': OPF('role'), 'file-as': OPF('file-as'),
                      'scheme': OPF('scheme'), 'event': OPF('event'),
                      'type': XSI('type'), 'lang': XML('lang'), 'id': 'id'}
-    
+    OPF1_NSMAP    = {'dc': DC11_NS, 'oebpackage': OPF1_NS}
+    OPF2_NSMAP    = {'opf': OPF2_NS, 'dc': DC11_NS, 'dcterms': DCTERMS_NS,
+                     'xsi': XSI_NS, 'calibre': CALIBRE_NS}
+
     class Item(object):
         """An item of OEB data model metadata.
 
@@ -300,13 +313,13 @@ class Metadata(object):
         """
         class Attribute(object):
             """Smart accessor for allowed OEB metadata item attributes."""
-            
+
             def __init__(self, attr, allowed=None):
                 if not callable(attr):
                     attr_, attr = attr, lambda term: attr_
                 self.attr = attr
                 self.allowed = allowed
-            
+
             def term_attr(self, obj):
                 term = obj.term
                 if namespace(term) != DC11_NS:
@@ -317,14 +330,14 @@ class Metadata(object):
                         'attribute %r not valid for metadata term %r' \
                             % (self.attr(term), barename(obj.term)))
                 return self.attr(term)
-            
+
             def __get__(self, obj, cls):
                 if obj is None: return None
                 return obj.attrib.get(self.term_attr(obj), '')
-            
+
             def __set__(self, obj, value):
                 obj.attrib[self.term_attr(obj)] = value
-        
+
         def __init__(self, term, value, attrib={}, nsmap={}, **kwargs):
             self.attrib = attrib = dict(attrib)
             self.nsmap = nsmap = dict(nsmap)
@@ -364,7 +377,7 @@ class Metadata(object):
             def fset(self, value):
                 self.value = value
             return property(fget=fget, fset=fset)
-                    
+
         scheme  = Attribute(lambda term: 'scheme' if \
                                 term == OPF('meta') else OPF('scheme'),
                             [DC('identifier'), OPF('meta')])
@@ -379,19 +392,19 @@ class Metadata(object):
                                           DC('relation'), DC('rights'),
                                           DC('source'), DC('subject'),
                                           OPF('meta')])
-        
+
         def __getitem__(self, key):
             return self.attrib[key]
-        
+
         def __setitem__(self, key, value):
             self.attrib[key] = value
-        
+
         def __contains__(self, key):
             return key in self.attrib
-        
+
         def get(self, key, default=None):
             return self.attrib.get(key, default)
-        
+
         def __repr__(self):
             return 'Item(term=%r, value=%r, attrib=%r)' \
                 % (barename(self.term), self.value, self.attrib)
@@ -417,7 +430,7 @@ class Metadata(object):
                 elem.attrib['name'] = prefixname(self.term, nsrmap)
                 elem.attrib['content'] = prefixname(self.value, nsrmap)
             return elem
-        
+
         def to_opf2(self, parent=None, nsrmap={}):
             attrib = {}
             for key, value in self.attrib.items():
@@ -430,7 +443,7 @@ class Metadata(object):
                 elem.attrib['name'] = prefixname(self.term, nsrmap)
                 elem.attrib['content'] = prefixname(self.value, nsrmap)
             return elem
-    
+
     def __init__(self, oeb):
         self.oeb = oeb
         self.items = defaultdict(list)
@@ -465,7 +478,7 @@ class Metadata(object):
                     nsmap.update(item.nsmap)
             return nsmap
         return property(fget=fget)
-    
+
     @dynamic_property
     def _opf1_nsmap(self):
         def fget(self):
@@ -475,7 +488,7 @@ class Metadata(object):
                     del nsmap[key]
             return nsmap
         return property(fget=fget)
-    
+
     @dynamic_property
     def _opf2_nsmap(self):
         def fget(self):
@@ -483,7 +496,7 @@ class Metadata(object):
             nsmap.update(OPF2_NSMAP)
             return nsmap
         return property(fget=fget)
-    
+
     def to_opf1(self, parent=None):
         nsmap = self._opf1_nsmap
         nsrmap = dict((value, key) for key, value in nsmap.items())
@@ -497,7 +510,7 @@ class Metadata(object):
             chaptertour = self.Item('ms-chaptertour', 'chaptertour')
             chaptertour.to_opf1(dcmeta, xmeta, nsrmap=nsrmap)
         return elem
-        
+
     def to_opf2(self, parent=None):
         nsmap = self._opf2_nsmap
         nsrmap = dict((value, key) for key, value in nsmap.items())
@@ -523,7 +536,7 @@ class Manifest(object):
     :attr:`hrefs`: A dictionary in which the keys are the internal paths of the
         manifest items and the values are the items themselves.
     """
-    
+
     class Item(object):
         """An OEB data model book content file.
 
@@ -543,10 +556,10 @@ class Manifest(object):
             which are not (such as footnotes).  Meaningless for items which
             have a :attr:`spine_position` of `None`.
         """
-    
+
         NUM_RE = re.compile('^(.*)([0-9][0-9.]*)(?=[.]|$)')
         META_XP = XPath('/h:html/h:head/h:meta[@http-equiv="Content-Type"]')
-    
+
         def __init__(self, oeb, id, href, media_type,
                      fallback=None, loader=str, data=None):
             self.oeb = oeb
@@ -565,17 +578,10 @@ class Manifest(object):
             return 'Item(id=%r, href=%r, media_type=%r)' \
                 % (self.id, self.href, self.media_type)
 
-        def _force_xhtml(self, data):
+        def _parse_xhtml(self, data):
             # Convert to Unicode and normalize line endings
             data = self.oeb.decode(data)
-            data = XMLDECL_RE.sub('', data)
-            # Handle broken XHTML w/ SVG (ugh)
-            if 'svg:' in data and SVG_NS not in data:
-                data = data.replace(
-                    '<html', '<html xmlns:svg="%s"' % SVG_NS, 1)
-            if 'xlink:' in data and XLINK_NS not in data:
-                data = data.replace(
-                    '<html', '<html xmlns:xlink="%s"' % XLINK_NS, 1)
+            data = self.oeb.html_preprocessor(data)
             # Try with more & more drastic measures to parse
             try:
                 data = etree.fromstring(data)
@@ -599,12 +605,16 @@ class Manifest(object):
                         data = etree.fromstring(data, parser=RECOVER_PARSER)
             # Force into the XHTML namespace
             if barename(data.tag) != 'html':
-                raise OEBError(
+                raise NotHTML(
                     'File %r does not appear to be (X)HTML' % self.href)
             elif not namespace(data.tag):
                 data.attrib['xmlns'] = XHTML_NS
                 data = etree.tostring(data, encoding=unicode)
-                data = etree.fromstring(data)
+                try:
+                    data = etree.fromstring(data)
+                except:
+                    data=data.replace(':=', '=').replace(':>', '>')
+                    data = etree.fromstring(data)
             elif namespace(data.tag) != XHTML_NS:
                 # OEB_DOC_NS, but possibly others
                 ns = namespace(data.tag)
@@ -645,7 +655,29 @@ class Manifest(object):
                     'File %r missing <body/> element' % self.href)
                 etree.SubElement(data, XHTML('body'))
             return data
-        
+
+        def _parse_css(self, data):
+            data = self.oeb.decode(data)
+            data = self.CSSPreProcessor(data)
+            data = XHTML_CSS_NAMESPACE + data
+            parser = CSSParser(log=self.oeb.logger, loglevel=logging.WARNING,
+                               fetcher=self._fetch_css)
+            data = parser.parseString(data, href=self.href)
+            data.namespaces['h'] = XHTML_NS
+            return data
+
+        def _fetch_css(self, path):
+            hrefs = self.oeb.manifest.hrefs
+            if path not in hrefs:
+                self.oeb.logger.warn('CSS import of missing file %r' % path)
+                return (None, None)
+            item = hrefs[path]
+            if item.media_type not in OEB_STYLES:
+                self.oeb.logger.warn('CSS import of non-CSS file %r' % path)
+                return (None, None)
+            data = item.data.cssText
+            return ('utf-8', data)
+
         @dynamic_property
         def data(self):
             doc = """Provides MIME type sensitive access to the manifest
@@ -661,15 +693,19 @@ class Manifest(object):
               special parsing.
             """
             def fget(self):
-                if self._data is not None:
-                    return self._data
-                data = self._loader(self.href)
-                if self.media_type in OEB_DOCS:
-                    data = self._force_xhtml(data)
+                data = self._data
+                if data is None:
+                    if self._loader is None:
+                        return None
+                    data = self._loader(self.href)
+                if not isinstance(data, basestring):
+                    pass # already parsed
+                elif self.media_type in OEB_DOCS:
+                    data = self._parse_xhtml(data)
                 elif self.media_type[-4:] in ('+xml', '/xml'):
                     data = etree.fromstring(data)
                 elif self.media_type in OEB_STYLES:
-                    data = self.oeb.decode(data)
+                    data = self._parse_css(data)
                 self._data = data
                 return data
             def fset(self, value):
@@ -677,7 +713,7 @@ class Manifest(object):
             def fdel(self):
                 self._data = None
             return property(fget, fset, fdel, doc=doc)
-                
+
         def __str__(self):
             data = self.data
             if isinstance(data, etree._Element):
@@ -685,13 +721,13 @@ class Manifest(object):
             if isinstance(data, unicode):
                 return data.encode('utf-8')
             return str(data)
-        
+
         def __eq__(self, other):
             return id(self) == id(other)
-        
+
         def __ne__(self, other):
             return not self.__eq__(other)
-        
+
         def __cmp__(self, other):
             result = cmp(self.spine_position, other.spine_position)
             if result != 0:
@@ -705,7 +741,7 @@ class Manifest(object):
             onum = float(omatch.group(2)) if omatch else 0.0
             okey = (oref, onum, other.id)
             return cmp(skey, okey)
-        
+
         def relhref(self, href):
             """Convert the URL provided in :param:`href` from a book-absolute
             reference to a reference relative to this manifest item.
@@ -742,7 +778,7 @@ class Manifest(object):
             href = os.path.join(dirname, href)
             href = os.path.normpath(href).replace('\\', '/')
             return href
-    
+
     def __init__(self, oeb):
         self.oeb = oeb
         self.items = set()
@@ -757,7 +793,7 @@ class Manifest(object):
         MIME type which is not one of the OPS core media types.  Either the
         item's data itself may be provided with :param:`data`, or a loader
         function for the data may be provided with :param:`loader`, or the
-        item's data may latter be set manually via the :attr:`data` attribute.
+        item's data may later be set manually via the :attr:`data` attribute.
         """
         item = self.Item(
             self.oeb, id, href, media_type, fallback, loader, data)
@@ -804,9 +840,12 @@ class Manifest(object):
         for item in self.items:
             yield item
 
+    def __len__(self):
+        return len(self.items)
+
     def values(self):
         return list(self.items)
-    
+
     def __contains__(self, item):
         return item in self.items
 
@@ -824,7 +863,7 @@ class Manifest(object):
                 attrib['fallback'] = item.fallback
             element(elem, 'item', attrib=attrib)
         return elem
-    
+
     def to_opf2(self, parent=None):
         elem = element(parent, OPF('manifest'))
         for item in self.items:
@@ -861,14 +900,14 @@ class Spine(object):
         elif linear in ('no', 'false'):
             linear = False
         return linear
-        
+
     def add(self, item, linear=None):
         """Append :param:`item` to the end of the `Spine`."""
         item.linear = self._linear(linear)
         item.spine_position = len(self.items)
         self.items.append(item)
         return item
-    
+
     def insert(self, index, item, linear):
         """Insert :param:`item` at position :param:`index` in the `Spine`."""
         item.linear = self._linear(linear)
@@ -877,7 +916,7 @@ class Spine(object):
         for i in xrange(index, len(self.items)):
             self.items[i].spine_position = i
         return item
-    
+
     def remove(self, item):
         """Remove :param:`item` from the `Spine`."""
         index = item.spine_position
@@ -885,7 +924,7 @@ class Spine(object):
         for i in xrange(index, len(self.items)):
             self.items[i].spine_position = i
         item.spine_position = None
-    
+
     def __iter__(self):
         for item in self.items:
             yield item
@@ -923,7 +962,7 @@ class Guide(object):
     Provides dictionary-like access, in which the keys are the OEB reference
     type identifiers and the values are `Reference` objects.
     """
-    
+
     class Reference(object):
         """Reference to a standard book section.
 
@@ -955,7 +994,7 @@ class Guide(object):
         TYPES = set(t for t, _ in _TYPES_TITLES)
         TITLES = dict(_TYPES_TITLES)
         ORDER = dict((t, i) for i, (t, _) in enumerate(_TYPES_TITLES))
-        
+
         def __init__(self, oeb, type, title, href):
             self.oeb = oeb
             if type.lower() in self.TYPES:
@@ -968,22 +1007,22 @@ class Guide(object):
             self.type = type
             self.title = title
             self.href = urlnormalize(href)
-        
+
         def __repr__(self):
             return 'Reference(type=%r, title=%r, href=%r)' \
                 % (self.type, self.title, self.href)
-        
+
         @dynamic_property
         def _order(self):
             def fget(self):
                 return self.ORDER.get(self.type, self.type)
             return property(fget=fget)
-        
+
         def __cmp__(self, other):
             if not isinstance(other, Guide.Reference):
                 return NotImplemented
             return cmp(self._order, other._order)
-        
+
         @dynamic_property
         def item(self):
             doc = """The manifest item associated with this reference."""
@@ -992,41 +1031,41 @@ class Guide(object):
                 hrefs = self.oeb.manifest.hrefs
                 return hrefs.get(path, None)
             return property(fget=fget, doc=doc)
-    
+
     def __init__(self, oeb):
         self.oeb = oeb
         self.refs = {}
-    
+
     def add(self, type, title, href):
         """Add a new reference to the `Guide`."""
         ref = self.Reference(self.oeb, type, title, href)
         self.refs[type] = ref
         return ref
-    
+
     def iterkeys(self):
         for type in self.refs:
             yield type
     __iter__ = iterkeys
-    
+
     def values(self):
         return sorted(self.refs.values())
-    
+
     def items(self):
         for type, ref in self.refs.items():
             yield type, ref
-    
+
     def __getitem__(self, key):
         return self.refs[key]
-    
+
     def __delitem__(self, key):
         del self.refs[key]
-    
+
     def __contains__(self, key):
         return key in self.refs
-    
+
     def __len__(self):
         return len(self.refs)
-    
+
     def to_opf1(self, parent=None):
         elem = element(parent, 'guide')
         for ref in self.refs.values():
@@ -1035,7 +1074,7 @@ class Guide(object):
                 attrib['title'] = ref.title
             element(elem, 'reference', attrib=attrib)
         return elem
-    
+
     def to_opf2(self, parent=None):
         elem = element(parent, OPF('guide'))
         for ref in self.refs.values():
@@ -1065,7 +1104,7 @@ class TOC(object):
         self.klass = klass
         self.id = id
         self.nodes = []
-    
+
     def add(self, title, href, klass=None, id=None):
         """Create and return a new sub-node of this node."""
         node = TOC(title, href, klass, id)
@@ -1078,18 +1117,18 @@ class TOC(object):
         for child in self.nodes:
             for node in child.iter():
                 yield node
-    
+
     def iterdescendants(self):
         """Iterate over all descendant nodes in depth-first order."""
         for child in self.nodes:
             for node in child.iter():
                 yield node
-    
+
     def __iter__(self):
         """Iterate over all immediate child nodes."""
         for node in self.nodes:
             yield node
-    
+
     def __getitem__(self, index):
         return self.nodes[index]
 
@@ -1104,7 +1143,7 @@ class TOC(object):
                 prev.nodes.append(node)
             else:
                 prev = node
-    
+
     def depth(self):
         """The maximum depth of the navigation tree rooted at this node."""
         try:
@@ -1118,7 +1157,7 @@ class TOC(object):
                 'title': node.title, 'href': node.href})
             node.to_opf1(tour)
         return tour
-    
+
     def to_ncx(self, parent):
         for node in self.nodes:
             id = node.id or unicode(uuid.uuid4())
@@ -1139,7 +1178,7 @@ class PageList(object):
 
     Provides list-like access to the pages.
     """
-    
+
     class Page(object):
         """Represents a mapping between a page name and a position within
         the book content.
@@ -1157,17 +1196,17 @@ class PageList(object):
         :attr:`id`: Optional unique identifier for this page.
         """
         TYPES = set(['front', 'normal', 'special'])
-        
+
         def __init__(self, name, href, type='normal', klass=None, id=None):
             self.name = unicode(name)
             self.href = urlnormalize(href)
             self.type = type if type in self.TYPES else 'normal'
             self.id = id
             self.klass = klass
-    
+
     def __init__(self):
         self.pages = []
-    
+
     def add(self, name, href, type='normal', klass=None, id=None):
         """Create a new page and add it to the `PageList`."""
         page = self.Page(name, href, type, klass, id)
@@ -1176,11 +1215,11 @@ class PageList(object):
 
     def __len__(self):
         return len(self.pages)
-    
+
     def __iter__(self):
         for page in self.pages:
             yield page
-    
+
     def __getitem__(self, index):
         return self.pages[index]
 
@@ -1189,7 +1228,7 @@ class PageList(object):
 
     def remove(self, page):
         return self.pages.remove(page)
-    
+
     def to_ncx(self, parent=None):
         plist = element(parent, NCX('pageList'), id=str(uuid.uuid4()))
         values = dict((t, count(1)) for t in ('front', 'normal', 'special'))
@@ -1205,7 +1244,7 @@ class PageList(object):
             element(label, NCX('text')).text = page.name
             element(ptarget, NCX('content'), src=page.href)
         return plist
-    
+
     def to_page_map(self):
         pmap = etree.Element(OPF('page-map'), nsmap={None: OPF2_NS})
         for page in self.pages:
@@ -1215,25 +1254,33 @@ class PageList(object):
 
 class OEBBook(object):
     """Representation of a book in the IDPF OEB data model."""
-    
-    def __init__(self, logger, parse_cache={}, encoding='utf-8', 
-                 pretty_print=False):
-        """Create empty book.  Optional arguments:
-        
-        :param parse_cache: A cache of parsed XHTML/CSS. Keys are absolute
-            paths to te cached files and values are lxml root objects and
-            cssutils stylesheets.
+
+    COVER_SVG_XP    = XPath('h:body//svg:svg[position() = 1]')
+    COVER_OBJECT_XP = XPath('h:body//h:object[@data][position() = 1]')
+
+    def __init__(self, logger,
+            html_preprocessor=HTMLPreProcessor(),
+            css_preprocessor=CSSPreProcessor(),
+            encoding='utf-8', pretty_print=False):
+        """Create empty book.  Arguments:
+
         :param:`encoding`: Default encoding for textual content read
             from an external container.
         :param:`pretty_print`: Whether or not the canonical string form
             of XML markup is pretty-printed.
+        :param html_preprocessor: A callable that takes a unicode object
+            and returns a unicode object. Will be called on all html files
+            before they are parsed.
+        :param css_preprocessor: A callable that takes a unicode object
+            and returns a unicode object. Will be called on all CSS files
+            before they are parsed.
         :param:`logger`: A Log object to use for logging all messages
             related to the processing of this book.  It is accessible
             via the instance data members :attr:`logger,log`.
-        
+
         It provides the following public instance data members for
         accessing various parts of the OEB data model:
-        
+
         :attr:`metadata`: Metadata such as title, author name(s), etc.
         :attr:`manifest`: Manifest of all files included in the book,
             including MIME types and fallback information.
@@ -1245,7 +1292,10 @@ class OEBBook(object):
         :attr:`pages`: List of "pages," such as indexed to a print edition of
             the same text.
         """
+
         self.encoding = encoding
+        self.html_preprocessor = html_preprocessor
+        self.css_preprocessor = css_preprocessor
         self.pretty_print = pretty_print
         self.logger = self.log = logger
         self.version = '2.0'
@@ -1264,13 +1314,13 @@ class OEBBook(object):
         encoding = opts.encoding
         pretty_print = opts.pretty_print
         return cls(encoding=encoding, pretty_print=pretty_print)
-    
+
     def translate(self, text):
         """Translate :param:`text` into the book's primary language."""
         lang = str(self.metadata.language[0])
         lang = lang.split('-', 1)[0].lower()
         return translate(lang, text)
-    
+
     def decode(self, data):
         """Automatically decode :param:`data` into a `unicode` object."""
         if isinstance(data, unicode):
@@ -1293,7 +1343,7 @@ class OEBBook(object):
         data = data.replace('\r\n', '\n')
         data = data.replace('\r', '\n')
         return data
-    
+
     def to_opf1(self):
         """Produce OPF 1.2 representing the book's metadata and structure.
 
@@ -1340,7 +1390,7 @@ class OEBBook(object):
             order = playorder.get(href, 0)
             elem.attrib['playOrder'] = str(order)
         return
-    
+
     def _to_ncx(self):
         lang = unicode(self.metadata.language[0])
         ncx = etree.Element(NCX('ncx'),
@@ -1369,10 +1419,10 @@ class OEBBook(object):
             maxpnum.attrib['content'] = str(value)
         self._update_playorder(ncx)
         return ncx
-    
+
     def to_opf2(self, page_map=False):
         """Produce OPF 2.0 representing the book's metadata and structure.
-        
+
         Returns a dictionary in which the keys are MIME types and the values
         are tuples of (default) filenames and lxml.etree element structures.
         """
diff --git a/src/calibre/ebooks/oeb/factory.py b/src/calibre/ebooks/oeb/factory.py
index 684451044b..8add71d20d 100644
--- a/src/calibre/ebooks/oeb/factory.py
+++ b/src/calibre/ebooks/oeb/factory.py
@@ -8,6 +8,7 @@ __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 import sys, os, logging
 from itertools import chain
+import calibre
 from calibre.ebooks.oeb.base import OEBError
 from calibre.ebooks.oeb.reader import OEBReader
 from calibre.ebooks.oeb.writer import OEBWriter
@@ -15,7 +16,7 @@ from calibre.ebooks.lit.reader import LitReader
 from calibre.ebooks.lit.writer import LitWriter
 from calibre.ebooks.mobi.reader import MobiReader
 from calibre.ebooks.mobi.writer import MobiWriter
-from calibre.ebooks.oeb.base import Logger, OEBBook
+from calibre.ebooks.oeb.base import OEBBook
 from calibre.ebooks.oeb.profile import Context
 from calibre.utils.config import Config
 
@@ -77,8 +78,8 @@ def main(argv=sys.argv):
     if len(args) != 0:
         parser.print_help()
         return 1
-    logger = Logger(logging.getLogger('ebook-convert'))
-    logger.setup_cli_handler(opts.verbose)
+    logger = logging.getLogger('ebook-convert')
+    calibre.setup_cli_handlers(logger, logging.DEBUG)
     encoding = opts.encoding
     pretty_print = opts.pretty_print
     oeb = OEBBook(encoding=encoding, pretty_print=pretty_print, logger=logger)
diff --git a/src/calibre/ebooks/oeb/output.py b/src/calibre/ebooks/oeb/output.py
index 0a74f488cf..d8d52859eb 100644
--- a/src/calibre/ebooks/oeb/output.py
+++ b/src/calibre/ebooks/oeb/output.py
@@ -6,12 +6,12 @@ __docformat__ = 'restructuredtext en'
 from calibre.customize.conversion import OutputFormatPlugin
 
 class OEBOutput(OutputFormatPlugin):
-    
+
     name = 'OEB Output'
     author = 'Kovid Goyal'
     file_type = 'oeb'
-    
-    
-    def convert(self, oeb_book, input_plugin, options, parse_cache, log):
-        pass
-    
+
+
+    def convert(self, oeb_book, input_plugin, options, context, log):
+       pass
+
diff --git a/src/calibre/ebooks/oeb/reader.py b/src/calibre/ebooks/oeb/reader.py
index dbafa5afac..60c2cf23bf 100644
--- a/src/calibre/ebooks/oeb/reader.py
+++ b/src/calibre/ebooks/oeb/reader.py
@@ -32,13 +32,13 @@ __all__ = ['OEBReader']
 
 class OEBReader(object):
     """Read an OEBPS 1.x or OPF/OPS 2.0 file collection."""
-    
+
     COVER_SVG_XP    = XPath('h:body//svg:svg[position() = 1]')
     COVER_OBJECT_XP = XPath('h:body//h:object[@data][position() = 1]')
 
     Container = DirContainer
     """Container type used to access book files.  Override in sub-classes."""
-    
+
     DEFAULT_PROFILE = 'PRS505'
     """Default renderer profile for content read with this Reader."""
 
@@ -67,7 +67,7 @@ class OEBReader(object):
         opf = self._read_opf()
         self._all_from_opf(opf)
         return oeb
-    
+
     def _clean_opf(self, opf):
         nsmap = {}
         for elem in opf.iter(tag=etree.Element):
@@ -94,7 +94,7 @@ class OEBReader(object):
             for element in xpath(opf, tag):
                 nroot.append(element)
         return nroot
-    
+
     def _read_opf(self):
         data = self.oeb.container.read(None)
         data = self.oeb.decode(data)
@@ -111,7 +111,7 @@ class OEBReader(object):
             raise OEBError('Invalid namespace %r for OPF document' % ns)
         opf = self._clean_opf(opf)
         return opf
-    
+
     def _metadata_from_opf(self, opf):
         uid = opf.get('unique-identifier', None)
         self.oeb.uid = None
@@ -161,10 +161,30 @@ class OEBReader(object):
             self.logger.warn('Title not specified')
             metadata.add('title', self.oeb.translate(__('Unknown')))
 
-    def _manifest_add_missing(self):
+    def _manifest_prune_invalid(self):
+        '''
+        Remove items from manifest that contain invalid data. This prevents
+        catastrophic conversion failure, when a few files contain corrupted
+        data.
+        '''
+        bad = []
+        check = OEB_DOCS+OEB_STYLES
+        for item in list(self.oeb.manifest.values()):
+            if item.media_type in check:
+                try:
+                    item.data
+                except:
+                    self.logger.exception('Failed to parse content in %s'%
+                            item.href)
+                    bad.append(item)
+                    self.oeb.manifest.remove(item)
+        return bad
+
+    def _manifest_add_missing(self, invalid):
         manifest = self.oeb.manifest
         known = set(manifest.hrefs)
         unchecked = set(manifest.values())
+        bad = []
         while unchecked:
             new = set()
             for item in unchecked:
@@ -181,7 +201,7 @@ class OEBReader(object):
                         if not scheme and href not in known:
                             new.add(href)
                 elif item.media_type in OEB_STYLES:
-                    for match in CSSURL_RE.finditer(item.data):
+                    for match in CSSURL_RE.finditer(item.data.cssText):
                         href, _ = urldefrag(match.group('url'))
                         href = item.abshref(urlnormalize(href))
                         scheme = urlparse(href).scheme
@@ -190,6 +210,13 @@ class OEBReader(object):
             unchecked.clear()
             for href in new:
                 known.add(href)
+                is_invalid = False
+                for item in invalid:
+                    if href == item.abshref(urlnormalize(href)):
+                        is_invalid = True
+                        break
+                if is_invalid:
+                    continue
                 if not self.oeb.container.exists(href):
                     self.logger.warn('Referenced file %r not found' % href)
                     continue
@@ -199,7 +226,7 @@ class OEBReader(object):
                 media_type = guessed or BINARY_MIME
                 added = manifest.add(id, href, media_type)
                 unchecked.add(added)
-    
+
     def _manifest_from_opf(self, opf):
         manifest = self.oeb.manifest
         for elem in xpath(opf, '/o2:package/o2:manifest/o2:item'):
@@ -222,8 +249,9 @@ class OEBReader(object):
                 self.logger.warn(u'Duplicate manifest id %r' % id)
                 id, href = manifest.generate(id, href)
             manifest.add(id, href, media_type, fallback)
-        self._manifest_add_missing()
-    
+        invalid = self._manifest_prune_invalid()
+        self._manifest_add_missing(invalid)
+
     def _spine_add_extra(self):
         manifest = self.oeb.manifest
         spine = self.oeb.spine
@@ -256,7 +284,7 @@ class OEBReader(object):
                 self.logger.warn(
                     'Spine-referenced file %r not in spine' % item.href)
             spine.add(item, linear=False)
-    
+
     def _spine_from_opf(self, opf):
         spine = self.oeb.spine
         manifest = self.oeb.manifest
@@ -270,7 +298,7 @@ class OEBReader(object):
         if len(spine) == 0:
             raise OEBError("Spine is empty")
         self._spine_add_extra()
-    
+
     def _guide_from_opf(self, opf):
         guide = self.oeb.guide
         manifest = self.oeb.manifest
@@ -281,7 +309,7 @@ class OEBReader(object):
                 self.logger.warn(u'Guide reference %r not found' % href)
                 continue
             guide.add(elem.get('type'), elem.get('title'), href)
-    
+
     def _find_ncx(self, opf):
         result = xpath(opf, '/o2:package/o2:spine/@toc')
         if result:
@@ -294,9 +322,9 @@ class OEBReader(object):
         for item in self.oeb.manifest.values():
             if item.media_type == NCX_MIME:
                 self.oeb.manifest.remove(item)
-                return item                
+                return item
         return None
-    
+
     def _toc_from_navpoint(self, item, toc, navpoint):
         children = xpath(navpoint, 'ncx:navPoint')
         for child in children:
@@ -314,7 +342,7 @@ class OEBReader(object):
             klass = child.get('class')
             node = toc.add(title, href, id=id, klass=klass)
             self._toc_from_navpoint(item, node, child)
-    
+
     def _toc_from_ncx(self, item):
         if item is None:
             return False
@@ -328,7 +356,7 @@ class OEBReader(object):
         for navmap in navmaps:
             self._toc_from_navpoint(item, toc, navmap)
         return True
-    
+
     def _toc_from_tour(self, opf):
         result = xpath(opf, 'o2:tours/o2:tour')
         if not result:
@@ -345,11 +373,11 @@ class OEBReader(object):
             path, _ = urldefrag(urlnormalize(href))
             if path not in self.oeb.manifest.hrefs:
                 self.logger.warn('TOC reference %r not found' % href)
-                continue            
+                continue
             id = site.get('id')
             toc.add(title, href, id=id)
         return True
-    
+
     def _toc_from_html(self, opf):
         if 'toc' not in self.oeb.guide:
             return False
@@ -381,7 +409,7 @@ class OEBReader(object):
         for href in order:
             toc.add(' '.join(titles[href]), href)
         return True
-    
+
     def _toc_from_spine(self, opf):
         toc = self.oeb.toc
         titles = []
@@ -408,14 +436,14 @@ class OEBReader(object):
             if not item.linear: continue
             toc.add(title, item.href)
         return True
-    
+
     def _toc_from_opf(self, opf, item):
         if self._toc_from_ncx(item): return
         if self._toc_from_tour(opf): return
         self.logger.warn('No metadata table of contents found')
         if self._toc_from_html(opf): return
         self._toc_from_spine(opf)
-    
+
     def _pages_from_ncx(self, opf, item):
         if item is None:
             return False
@@ -436,7 +464,7 @@ class OEBReader(object):
             klass = ptarget.get('class')
             pages.add(name, href, type=type, id=id, klass=klass)
         return True
-    
+
     def _find_page_map(self, opf):
         result = xpath(opf, '/o2:package/o2:spine/@page-map')
         if result:
@@ -451,7 +479,7 @@ class OEBReader(object):
                 self.oeb.manifest.remove(item)
                 return item
         return None
-    
+
     def _pages_from_page_map(self, opf):
         item = self._find_page_map(opf)
         if item is None:
@@ -472,12 +500,12 @@ class OEBReader(object):
                 type = 'front'
             pages.add(name, href, type=type)
         return True
-    
+
     def _pages_from_opf(self, opf, item):
         if self._pages_from_ncx(opf, item): return
         if self._pages_from_page_map(opf): return
         return
-    
+
     def _cover_from_html(self, hcover):
         with TemporaryDirectory('_html_cover') as tdir:
             writer = OEBWriter()
@@ -488,7 +516,7 @@ class OEBReader(object):
         id, href = self.oeb.manifest.generate('cover', 'cover.jpeg')
         item = self.oeb.manifest.add(id, href, JPEG_MIME, data=data)
         return item
-        
+
     def _locate_cover_image(self):
         if self.oeb.metadata.cover:
             id = str(self.oeb.metadata.cover[0])
@@ -525,14 +553,14 @@ class OEBReader(object):
             if item is not None and item.media_type in OEB_IMAGES:
                 return item
         return self._cover_from_html(hcover)
-        
+
     def _ensure_cover_image(self):
         cover = self._locate_cover_image()
         if self.oeb.metadata.cover:
             self.oeb.metadata.cover[0].value = cover.id
             return
         self.oeb.metadata.add('cover', cover.id)
-    
+
     def _all_from_opf(self, opf):
         self.oeb.version = opf.get('version', '1.2')
         self._metadata_from_opf(opf)
@@ -543,7 +571,7 @@ class OEBReader(object):
         self._toc_from_opf(opf, item)
         self._pages_from_opf(opf, item)
         self._ensure_cover_image()
-    
+
 
 def main(argv=sys.argv):
     reader = OEBReader()
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index 3b5c3e19d0..8bc82883e3 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -115,8 +115,7 @@ class Stylizer(object):
         cssname = os.path.splitext(basename)[0] + '.css'
         stylesheets = [HTML_CSS_STYLESHEET]
         head = xpath(tree, '/h:html/h:head')[0]
-        parser = cssutils.CSSParser()
-        parser.setFetcher(self._fetch_css_file)
+        parser = cssutils.CSSParser(fetcher=self._fetch_css_file)
         for elem in head:
             if elem.tag == XHTML('style') and elem.text \
                and elem.get('type', CSS_MIME) in OEB_STYLES:
@@ -135,14 +134,7 @@ class Stylizer(object):
                         'Stylesheet %r referenced by file %r not in manifest' %
                         (path, item.href))
                     continue
-                if sitem in self.STYLESHEETS:
-                    stylesheet = self.STYLESHEETS[sitem]
-                else:
-                    data = self._fetch_css_file(path)[1]
-                    stylesheet = parser.parseString(data, href=path)
-                    stylesheet.namespaces['h'] = XHTML_NS
-                    self.STYLESHEETS[sitem] = stylesheet
-                stylesheets.append(stylesheet)
+                stylesheets.append(sitem.data)
         rules = []
         index = 0
         self.stylesheets = set()
@@ -159,9 +151,9 @@ class Stylizer(object):
         for _, _, cssdict, text, _ in rules:
             try:
                 selector = CSSSelector(text)
-            except (AssertionError, ExpressionError, etree.XPathSyntaxError,\
-                NameError, # gets thrown on OS X instead of SelectorSyntaxError
-                SelectorSyntaxError):
+            except (AssertionError, ExpressionError, etree.XPathSyntaxError,
+                    NameError, # thrown on OS X instead of SelectorSyntaxError
+                    SelectorSyntaxError):
                 continue
             for elem in selector(tree):
                 self.style(elem)._update_cssdict(cssdict)
@@ -171,9 +163,13 @@ class Stylizer(object):
     def _fetch_css_file(self, path):
         hrefs = self.oeb.manifest.hrefs
         if path not in hrefs:
+            self.logger.warn('CSS import of missing file %r' % path)
             return (None, None)
-        data = hrefs[path].data
-        data = XHTML_CSS_NAMESPACE + data
+        item = hrefs[path]
+        if item.media_type not in OEB_STYLES:
+            self.logger.warn('CSS import of non-CSS file %r' % path)
+            return (None, None)
+        data = item.data.cssText
         return ('utf-8', data)
     
     def flatten_rule(self, rule, href, index):
diff --git a/src/calibre/ebooks/oeb/transforms/__init__.py b/src/calibre/ebooks/oeb/transforms/__init__.py
index e69de29bb2..3d1a86922e 100644
--- a/src/calibre/ebooks/oeb/transforms/__init__.py
+++ b/src/calibre/ebooks/oeb/transforms/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
+
diff --git a/src/calibre/ebooks/oeb/transforms/trimmanifest.py b/src/calibre/ebooks/oeb/transforms/trimmanifest.py
index c731800999..cae56315e5 100644
--- a/src/calibre/ebooks/oeb/transforms/trimmanifest.py
+++ b/src/calibre/ebooks/oeb/transforms/trimmanifest.py
@@ -20,11 +20,10 @@ class ManifestTrimmer(object):
     @classmethod
     def generate(cls, opts):
         return cls()
-    
+
     def __call__(self, oeb, context):
         oeb.logger.info('Trimming unused files from manifest...')
         used = set()
-        hrefs = oeb.manifest.hrefs
         for term in oeb.metadata:
             for item in oeb.metadata[term]:
                 if item.value in oeb.manifest.hrefs:
@@ -42,7 +41,7 @@ class ManifestTrimmer(object):
         while unchecked:
             new = set()
             for item in unchecked:
-                if (item.media_type in OEB_DOCS or 
+                if (item.media_type in OEB_DOCS or
                     item.media_type[-4:] in ('/xml', '+xml')) and \
                    item.data is not None:
                     hrefs = [sel(item.data) for sel in LINK_SELECTORS]
@@ -53,7 +52,7 @@ class ManifestTrimmer(object):
                             if found not in used:
                                 new.add(found)
                 elif item.media_type == CSS_MIME:
-                    for match in CSSURL_RE.finditer(item.data):
+                    for match in CSSURL_RE.finditer(item.data.cssText):
                         href = match.group('url')
                         href = item.abshref(urlnormalize(href))
                         if href in oeb.manifest.hrefs:
diff --git a/src/calibre/ebooks/oeb/writer.py b/src/calibre/ebooks/oeb/writer.py
index 235965b50f..8789d03470 100644
--- a/src/calibre/ebooks/oeb/writer.py
+++ b/src/calibre/ebooks/oeb/writer.py
@@ -8,7 +8,7 @@ __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 import sys, os, logging
 from calibre.ebooks.oeb.base import OPF_MIME, xml2str
-from calibre.ebooks.oeb.base import Logger, DirContainer, OEBBook
+from calibre.ebooks.oeb.base import DirContainer, OEBBook
 
 __all__ = ['OEBWriter']
 
diff --git a/src/calibre/ezPyCrypto.py b/src/calibre/ezPyCrypto.py
deleted file mode 100755
index a899633958..0000000000
--- a/src/calibre/ezPyCrypto.py
+++ /dev/null
@@ -1,1334 +0,0 @@
-#@+leo
-#@+node:0::@file easy/ezPyCrypto.py
-#@+body
-
-
-#@@language python
-#@<< ezPyCrypto declarations >>
-#@+node:1::<< ezPyCrypto declarations >>
-#@+body
-"""
-ezPyCrypto - very simple API for military-grade cryptography
-in Python.
-
-Designed to be approachable for even total crypto newbies,
-this may be the only crypto API for Python you ever need.
-
-Features:
- - Create, Import and Export public keys and public/private keypairs - easy
- - Encrypt and Decrypt arbitrary-sized pieces of data, such as
-   strings or files
- - Open up 'streams', so this object can be used as an encrypting/decrypting
-   filter - good for socket-based comms and crypto of large files
- - Sign and Verify documents without fuss
- - Create private keys with or without a passphrase
- - Export private keys with a different (or no) passphrase
- - Sensible defaults - no need to specify a zillion options (or any options
-   at all) unless you  want to
- - Algorithms include RSA, ElGamal, DSA, ARC2, Blowfish, CAST, DES3, IDEA and RC5
-   (default RSA and Blowfish)
- - Choose your own public and session key sizes (or accept defaults)
-
-Contains an easily-used yet versatile cryptography class, called
-L{key}, that performs stream and block encryption.
-
-Packaged with a suite of very simple example programs, which demonstrate
-ezPyCrypto and speed learning.
-
-ezPyCrypto requires the PyCrypto library (which I have hand-picked from
-several different Python crypto APIs, since it's the only
-API that doesn't lead its programmers on a wild goose chase
-of 3rd party libs, or require dozens/hundreds of lines of
-code just to do basic stuff, or lack in documentation.
-PyCrypto is available from http://pycrypto.sf.net)
-
-PyCrypto is a very usable and well implemented lower-level
-crypto API for Python. C backends give it speed, while
-well designed OO interface makes it relatively fast to learn.
-Also, it compiles cleanly and smoothly on Linux and Windows
-with no dramas.
-
-But I've written this module because PyCrypto is relatively
-low-level, and does present a harder learning curve for newbies.
-
-ezPyCrypto is written by David McNab <david@freenet.org.nz>
-Released under the GNU General Public License.
-No warranty, yada yada
-
-Refer to the documentation for class 'key' for more info.
-"""
-
-from pdb import set_trace as trace
-import pickle
-import types
-import base64
-import zlib
-
-import Crypto
-
-from Crypto.PublicKey import ElGamal, DSA, RSA
-from Crypto.Util.randpool import RandomPool
-from Crypto.Util.number import getPrime
-from Crypto.Cipher import ARC2, Blowfish, CAST, DES3, IDEA, RC5
-from Crypto.Hash import MD5
-
-#@-body
-#@-node:1::<< ezPyCrypto declarations >>
-
-
-#@+others
-#@+node:2::exceptions
-#@+body
-# Define some exceptions for the various problems that can happen
-
-class CryptoKeyError(Exception):
-    "Attempt to import invalid key"
-
-
-#@-body
-#@-node:2::exceptions
-#@+node:3::class key
-#@+body
-class key:
-    """
-    This may well be the only crypto class for Python that you'll ever need.
-    Think of this class, and the ezPyCrypto module, as 'cryptography for
-    the rest of us'.
-
-    Designed to strike the optimal balance between ease of use, features
-    and performance.
-
-    Basic High-level methods:
-
-     - L{encString} - encrypt a string
-     - L{decString} - decrypt a string
-
-     - L{encStringToAscii} - encrypt a string to a printable, mailable format
-     - L{decStringFromAscii} - decrypt an ascii-format encrypted string
-
-     - L{signString} - produce ascii-format signature of a string
-     - L{verifyString} - verify a string against a signature
-
-     - L{importKey} - import public key (and possibly private key too)
-     - L{exportKey} - export public key only, as printable mailable string
-     - L{exportKeyPrivate} - same, but export private key as well
-     - L{makeNewKeys} - generate a new, random private/public key pair
-
-    Middle-level (stream-oriented) methods:
-
-     - L{encStart} - start a stream encryption session
-     - L{encNext} - encrypt another piece of data
-     - L{encEnd} - finalise stream encryption session
-
-     - L{decStart} - start a stream decryption session
-     - L{decNext} - decrypt the next piece of available data
-     - L{decEnd} - finalise stream decryption session
-
-    Low-level methods:
-
-     - refer to the source code
-    
-    Principle of operation:
-
-     - Data is encrypted with choice of symmetric block-mode session cipher
-       (or default Blowfish if user doesn't care)
-     - CFB block chaining is used for added security - each next block's
-       key is affected by the previous block
-     - The session key and initial value (IV) are encrypted against an RSA
-       or ElGamal public key (user's choice, default RSA)
-     - Each block in the stream is prepended with a 'length' byte, indicating
-       how many bytes in the decrypted block are significant - needed when
-       total data len mod block size is non-zero
-     - Format of encrypted data is:
-         - public key len - 2 bytes, little-endian - size of public key in bytes
-        - public key - public key of recipient
-        - block cipher len - unencrypted length byte - size of block cipher in bytes
-        - block cipher - encrypted against public key, index into array
-          of session algorithms
-        - block key len - unencrypted length byte - size of block key in bytes
-        - block key - encrypted against public key
-        - block IV len - unencrypted length of block cipher IV - IV length in bytes
-        - block cipher IV - encrypted against public key, prefixed 1-byte length
-        - block1 len - 1 byte - number of significant chars in block1 *
-        - block1 data - always 8 bytes, encrypted against session key
-        - ...
-        - blockn len
-        - blockn data
-        - If last data block is of the same size as the session cipher blocksize,
-          a final byte 0x00 is sent.
-    """
-    
-    #@<< class key declarations >>
-    #@+node:1::<< class key declarations >>
-    #@+body
-    # Various lookup tables for encryption algorithms
-    
-    _algosPub = {'ElGamal':ElGamal, 'RSA':RSA}
-    
-    _algosPub1 = {ElGamal:'ElGamal', RSA:'RSA'}
-    
-    _algosSes = { "ARC2":ARC2, "Blowfish":Blowfish, "CAST":CAST,
-                  "DES3":DES3, "IDEA":IDEA, "RC5":RC5}
-    _algosSes1 = {'ARC2':0, 'Blowfish':1, 'CAST':2, 'DES3':3, 'IDEA':4, 'RC5':5}
-    
-    _algosSes2 = [ARC2, Blowfish, CAST, DES3, IDEA, RC5]
-    
-    _algosSes3 = {ARC2:'ARC2', Blowfish:'Blowfish', CAST:'CAST',
-                  DES3:'DES3', IDEA:'IDEA', RC5:'RC5'}
-    
-    # Generate IV for passphrase encryption
-    _passIV = "w8Z4(51fKH#p{!29Q05HWcb@K 6(1qdyv{9|4=+gvji$chw!9$38^2cyGK#;}'@DHx%3)q_skvh4#0*="
-    
-    # Buffer for yet-to-be-encrypted stream data
-    _encBuf = ''
-    
-    #@-body
-    #@-node:1::<< class key declarations >>
-
-
-    #@+others
-    #@+node:2::__init__
-    #@+body
-    def __init__(self, something = 512, algoPub=None, algoSess=None, **kwds):
-        """Constructor. Creates a key object
-    
-        This constructor, when creating the key object, does one of
-        two things:
-         1. Creates a completely new keypair, OR
-         2. Imports an existing keypair
-    
-        Arguments:
-         1. If new keys are desired:
-             - key size in bits (int), default 512 - advise at least 1536
-             - algoPub - either 'RSA' or 'ElGamal' (default 'RSA')
-             - algoSess - one of 'ARC2', 'Blowfish', 'CAST', 'DES3', 'IDEA', 'RC5',
-               (default 'Blowfish')
-         2. If importing an existing key or keypair:
-             - keyobj (string) - result of a prior exportKey() call
-        Keywords:
-         - passphrase - default '':
-            - If creating new keypair, this passphrase is used to encrypt privkey when
-              exporting.
-            - If importing a new keypair, the passphrase is used to authenticate and
-              grant/deny access to private key
-        """
-        passphrase = kwds.get('passphrase', '')
-    
-        if type(something) is types.IntType:
-            # which public key algorithm did they choose?
-            if algoPub == None:
-                algoPub = 'RSA'
-            algoP = self._algosPub.get(algoPub, None)
-            if algoP == None:
-                # Whoops - don't know that one
-                raise Exception("AlgoPub must be one of 'ElGamel', 'RSA' or 'DSA'")
-            self.algoPub = algoP
-            self.algoPname = algoPub
-    
-            # which session key algorithm?
-            if algoSess == None:
-                algoSess = 'Blowfish'
-            algoS = self._algosSes.get(algoSess, None)
-            if algoS == None:
-                # Whoops - don't know that session algorithm
-                raise Exception("AlgoSess must be one of AES/ARC2/Blowfish/CAST/DES/DES3/IDEA/RC5")
-            self.algoSes = algoS
-            self.algoSname = algoSess
-    
-            # organise random data pool
-            self.randpool = RandomPool()
-            self.randfunc = self.randpool.get_bytes
-    
-            # now create the keypair
-            self.makeNewKeys(something, passphrase=passphrase)
-    
-        elif type(something) is types.StringType:
-            if algoPub != None:
-                raise Exception("Don't specify algoPub if importing a key")
-            if self.importKey(something, passphrase=passphrase) == False:
-                raise CryptoKeyError(
-                    "Attempted to import invalid key, or passphrase is bad")
-            self.randpool = RandomPool()
-            self.randfunc = self.randpool.get_bytes
-        else:
-            raise Exception("Must pass keysize or importable keys")
-    
-    #@-body
-    #@-node:2::__init__
-    #@+node:3::makeNewKeys()
-    #@+body
-    def makeNewKeys(self, keysize=512, **kwds):
-        """
-        Creates a new keypair in cipher object, and a new session key
-    
-        Arguments:
-         - keysize (default 512), advise at least 1536
-        Returns:
-         - None
-        Keywords:
-         - passphrase - used to secure exported private key - default '' (no passphrase)
-    
-        Keypair gets stored within the key object. Refer L{exportKey},
-        L{exportKeyPrivate} and L{importKey}.
-        
-        Generally no need to call this yourself, since the constructor
-        calls this in cases where you aren't instantiating with an
-        importable key.
-        """
-    
-        passphrase = kwds.get('passphrase', '')
-        if passphrase == None:
-            passphrase = ''
-        self.passphrase = passphrase
-    
-        # set up a public key object
-        self.randpool.stir()
-        self.k = self.algoPub.generate(keysize, self.randfunc)
-        self.randpool.stir()
-        self._calcPubBlkSize()
-    
-        # Generate random session key
-        self._genNewSessKey()
-    
-        # Create session cipher object
-        self.randpool.stir()
-    
-        #trace()
-    
-        # Create a new block cipher object
-        self._initBlkCipher()
-    
-    #@-body
-    #@-node:3::makeNewKeys()
-    #@+node:4::importKey()
-    #@+body
-    def importKey(self, keystring, **kwds):
-        """
-        Imports a public key or private/public key pair.
-    
-        (as previously exported from this object
-        with the L{exportKey} or L{exportKeyPrivate} methods.)
-    
-        Arguments:
-         - keystring - a string previously imported with
-           L{exportKey} or L{exportKeyPrivate}
-        Keywords:
-         - passphrase - string (default '', meaning 'try to import without passphrase')
-        Returns:
-         - True if import successful, False if failed
-    
-        You don't have to call this if you instantiate your key object
-        in 'import' mode - ie, by calling it with a previously exported key.
-    
-        Note - you shouldn't give a 'passphrase' when importing a public key.
-        """
-    
-        passphrase = kwds.get('passphrase', '')
-        if passphrase == None:
-            passphrase = ''
-    
-        try:
-            #k1 = keystring.split("<StartPycryptoKey>", 1)
-            #k2 = k1[1].split("<EndPycryptoKey>")
-            ##print "decoding:\n", k2[0]
-            #k = base64.decodestring(k2[0])
-    
-            #trace()
-    
-            keypickle = self._unwrap("Key", keystring)
-            keytuple = pickle.loads(keypickle)
-            haspass, size, keyobj = keytuple
-    
-            if haspass:
-                # decrypt against passphrase
-                blksiz = 8 # lazy of me
-    
-                # create temporary symmetric cipher object for passphrase - hardwire to Blowfish
-                ppCipher = Blowfish.new(passphrase,
-                                        Blowfish.MODE_CFB,
-                                        self._passIV[0:blksiz])
-                enclen = len(keyobj)
-                decpriv = ''
-                i = 0
-                while i < enclen:
-                    decbit = ppCipher.decrypt(keyobj[i:i+blksiz])
-                    decpriv += decbit
-                    i += blksiz
-                keyobj = decpriv[0:size]
-        
-            self.algoPname, self.k = pickle.loads(keyobj)
-            self.algoPub = self._algosPub[self.algoPname]
-    
-            #raise Exception("Tried to import Invalid Key")
-            self._calcPubBlkSize()
-            self.passphrase = passphrase
-            return True
-        except:
-            return False
-    
-    #@-body
-    #@-node:4::importKey()
-    #@+node:5::exportKey()
-    #@+body
-    def exportKey(self):
-        """
-        Exports the public key as a printable string.
-    
-        Exported keys can be imported elsewhere into MyCipher instances
-        with the L{importKey} method.
-        
-        Note that this object contains only the public key. If you want to
-        export the private key as well, call L{exportKeyPrivate} instaead.
-    
-        Note also that the exported string is Base64-encoded, and safe for sending
-        in email.
-    
-        Arguments:
-         - None
-        Returns:
-         - a base64-encoded string containing an importable key
-        """
-        rawpub = self._rawPubKey()
-        expTuple = (False, None, rawpub)
-        expPickle = pickle.dumps(expTuple, True)
-        return self._wrap("Key", expPickle)
-    
-    #@-body
-    #@-node:5::exportKey()
-    #@+node:6::exportKeyPrivate()
-    #@+body
-    def exportKeyPrivate(self, **kwds):
-        """
-        Exports public/private key pair as a printable string.
-    
-        This string is a binary string consisting of a pickled key object,
-        that can be imported elsewhere into MyCipher instances
-        with the L{importKey} method.
-        
-        Note that this object contains the public AND PRIVATE keys.
-        Don't EVER email any keys you export with this function (unless you
-        know what you're doing, and you encrypt the exported keys against
-        another key). When in doubt, use L{exportKey} instead.
-    
-        Keep your private keys safe at all times. You have been warned.
-    
-        Note also that the exported string is Base64-encoded, and safe for sending
-        in email.
-    
-        Arguments:
-         - None
-        Keywords:
-         - passphrase - default (None) to using existing passphrase. Set to '' to export
-           without passphrase (if this is really what you want to do!)
-        Returns:
-         - a base64-encoded string containing an importable key
-        """
-    
-        passphrase = kwds.get('passphrase', None)
-        if passphrase == None:
-            passphrase = self.passphrase
-    
-        # exported key is a pickle of the tuple:
-        # (haspassphrase, keylen, keypickle)
-        # if using passphrase, 'keypickle' is encrypted against blowfish, and 'keylen'
-        # indicates the number of significant bytes.
-    
-        rawpriv = pickle.dumps((self.algoPname, self.k), True)
-    
-        # prepare the key tuple, depending on whether we're using passphrases
-        if passphrase != '':
-            blksiz = 8 # i'm getting lazy, assuming 8 for blowfish
-    
-            # encrypt this against passphrase
-            ppCipher = Blowfish.new(passphrase,
-                                    Blowfish.MODE_CFB,
-                                    self._passIV[0:blksiz])
-            keylen = len(rawpriv)
-            extras = (blksiz - (keylen % blksiz)) % blksiz
-            rawpriv += self.randfunc(extras) # padd with random bytes
-            newlen = len(rawpriv)
-            encpriv = ''
-            #print "newlen = %d" % newlen
-            #trace()
-            i = 0
-            while i < newlen:
-                rawbit = rawpriv[i:i+blksiz]
-                encbit = ppCipher.encrypt(rawpriv[i:i+blksiz])
-                #print "i=%d rawbit len=%d, encbit len=%d" % (i, len(rawbit), len(encbit))
-                encpriv += encbit
-                i += blksiz
-            #print "keylen=%d, newlen=%d, len(encpriv)=%d" % (keylen, newlen, len(encpriv))
-            #trace()
-            keytuple = (True, keylen, encpriv)
-        else:
-            keytuple = (False, None, rawpriv)
-    
-        # prepare final pickle, base64 encode, wrap
-        keypickle = pickle.dumps(keytuple, True)
-        return self._wrap("Key", keypickle)
-    
-    
-    
-    #@-body
-    #@-node:6::exportKeyPrivate()
-    #@+node:7::encString()
-    #@+body
-    def encString(self, raw):
-        """
-        Encrypt a string of data
-    
-        High-level func. encrypts an entire string of data, returning the encrypted
-        string as binary.
-    
-        Arguments:
-         - raw string to encrypt
-        Returns:
-         - encrypted string as binary
-    
-        Note - the encrypted string can be stored in files, but I'd suggest
-        not emailing them - use L{encStringToAscii} instead. The sole advantage
-        of this method is that it produces more compact data, and works a bit faster.
-        """
-    
-        # All the work gets done by the stream level
-        self.encStart()
-    
-        # carve up into segments, because Python gets really slow
-        # at manipulating large strings
-    
-        size = len(raw)
-        bits = []
-        pos = 0
-        chunklen = 1024
-        while pos < size:
-            bits.append(self.encNext(raw[pos:pos+chunklen]))
-            pos += chunklen
-        bits.append(self.encEnd())
-    
-        return "".join(bits)
-    
-    #@-body
-    #@-node:7::encString()
-    #@+node:8::encStringToAscii()
-    #@+body
-    def encStringToAscii(self, raw):
-        """
-        Encrypts a string of data to printable ASCII format
-    
-        Use this method instead of L{encString}, unless size and speed are
-        major issues.
-    
-        This method returns encrypted data in bracketed  base64 format,
-        safe for sending in email.
-    
-        Arguments:
-         - raw - string to encrypt
-        Returns:
-         - enc - encrypted string, text-wrapped and Base-64 encoded, safe for
-           mailing.
-    
-        There's an overhead with base64-encoding. It costs size, bandwidth and
-        speed. Unless you need ascii-safety, use encString() instead.
-        """
-        enc = self.encString(raw)
-        return self._wrap("Message", enc)
-    
-    #@-body
-    #@-node:8::encStringToAscii()
-    #@+node:9::decString()
-    #@+body
-    def decString(self, enc):
-        """
-        Decrypts a previously encrypted string.
-    
-        Arguments:
-         - enc - string, previously encrypted in binary mode with encString
-        Returns:
-         - dec - raw decrypted string
-        """
-    
-        chunklen = 1024
-    
-        size = len(enc)
-        bits = []
-        pos = 0
-    
-        self.decStart()
-    
-        # carve up into small chunks so we don't get any order n^2 on large strings
-        while pos < size:
-            bits.append(self.decNext(enc[pos:pos+chunklen]))
-            pos += chunklen
-    
-        self.decEnd()
-    
-        dec = "".join(bits)
-        return dec
-    
-    #@-body
-    #@-node:9::decString()
-    #@+node:10::decStringFromAscii()
-    #@+body
-    def decStringFromAscii(self, enc):
-        """
-        Decrypts a previously encrypted string in ASCII (base64)
-        format, as created by encryptAscii()
-    
-        Arguments:
-         - enc - ascii-encrypted string, as previously encrypted with
-           encStringToAscii()
-        Returns:
-         - dec - decrypted string
-    
-        May generate an exception if the public key of the encrypted string
-        doesn't match the public/private keypair in this key object.
-    
-        To work around this problem, either instantiate a key object with
-        the saved keypair, or use the importKey() function.
-    
-        Exception will also occur if this object is not holding a private key
-        (which can happen if you import a key which was previously exported
-        via exportKey(). If you get this problem, use exportKeyPrivate() instead
-        to export your keypair.
-        """
-        #trace()
-        wrapped = self._unwrap("Message", enc)
-        return self.decString(wrapped)
-    
-    #@-body
-    #@-node:10::decStringFromAscii()
-    #@+node:11::signString()
-    #@+body
-    def signString(self, raw):
-        """
-        Sign a string using private key
-    
-        Arguments:
-         - raw - string to be signed
-        Returns:
-         - wrapped, base-64 encoded string of signature
-    
-        Note - private key must already be present in the key object.
-        Call L{importKey} for the right private key first if needed.
-        """
-    
-        # hash the key with MD5
-        m = MD5.new()
-        m.update(raw)
-        d = m.digest()
-        #print "sign: digest"
-        #print repr(d)
-    
-        # sign the hash with our current public key cipher
-        self.randpool.stir()
-        k = getPrime(128, self.randfunc)
-        self.randpool.stir()
-        s = self.k.sign(d, k)
-    
-        # now wrap into a tuple with the public key cipher
-        tup = (self.algoPname, s)
-    
-        # and pickle it
-        p = pickle.dumps(tup, True)
-    
-        # lastly, wrap it into our base64
-        w = self._wrap("Signature", p)
-    
-        return w
-    
-    #@-body
-    #@-node:11::signString()
-    #@+node:12::verifyString()
-    #@+body
-    def verifyString(self, raw, signature):
-        """
-        Verifies a string against a signature.
-    
-        Object must first have the correct public key loaded. (see
-        L{importKey}). An exception will occur if this is not the case.
-    
-        Arguments:
-         - raw - string to be verified
-         - signature - as produced when key is signed with L{signString}
-        Returns:
-         - True if signature is authentic, or False if not
-        """
-    
-        # unrwap the signature to a pickled tuple
-        p = self._unwrap("Signature", signature)
-    
-        # unpickle
-        algoname, rawsig = pickle.loads(p)
-    
-        # ensure we've got the right algorithm
-        if algoname != self.algoPname:
-            return False # wrong algorithm - automatic fail
-    
-        # hash the string
-        m = MD5.new()
-        m.update(raw)
-        d = m.digest()
-        #print "verify: digest"
-        #print repr(d)
-    
-        # now verify the hash against sig
-        if self.k.verify(d, rawsig):
-            return True # signature valid, or very clever forgery
-        else:
-            return False # sorry
-    
-    #@-body
-    #@-node:12::verifyString()
-    #@+node:13::test()
-    #@+body
-    def test(self, raw):
-        """
-        Encrypts, then decrypts a string. What you get back should
-        be the same as what you put in.
-    
-        This is totally useless - it just gives a way to test if this API
-        is doing what it should.
-        """
-        enc = self.encString(raw)
-        dec = self.decString(enc)
-        return dec
-    
-    #@-body
-    #@-node:13::test()
-    #@+node:14::testAscii()
-    #@+body
-    def testAscii(self, raw):
-        """
-        Encrypts, then decrypts a string. What you get back should
-        be the same as what you put in.
-    
-        This is totally useless - it just gives a way to test if this API
-        is doing what it should.
-        """
-        enc = self.encStringToAscii(raw)
-        dec = self.decStringFromAscii(enc)
-        return dec
-    
-    #@-body
-    #@-node:14::testAscii()
-    #@+node:15::Stream Methods
-    #@+body
-    # ---------------------------------------------
-    #
-    # These methods provide stream-level encryption
-    #
-    # ---------------------------------------------
-    
-    
-    #@-body
-    #@+node:1::encStart()
-    #@+body
-    def encStart(self):
-        """
-        Starts a stream encryption session
-        Sets up internal buffers for accepting ad-hoc data.
-    
-        No arguments needed, nothing returned.
-        """
-    
-        # Create a header block of segments, each segment is
-        # encrypted against recipient's public key, to enable
-        # recipient to decrypt the rest of the stream.
-    
-        # format of header block is:
-        #  - recipient public key
-        #  - stream algorithm id
-        #  - stream session key
-        #  - stream cipher initial value
-    
-        # Take algorithm index and pad it to the max length
-    
-        # stick in pubkey
-        pubkey = self._rawPubKey()
-        pubkeyLen = len(pubkey)
-    
-        self._tstSessKey0 = ''
-        self._tstSessKey1 = ''
-        self._tstIV0 = ''
-        self._tstIV1 = ''
-        self._tstBlk0 = ''
-        self._tstBlk1 = ''
-    
-        #print "pub key len=%d" % pubkeyLen
-        
-        len0 = pubkeyLen % 256
-        len1 = pubkeyLen / 256
-    
-        # Create algorithms info blk. Structure is:
-        #  1byte  - index into session ciphers table
-        #  2bytes - session key len, LSB first
-        #  1byte  - session IV len, LSB first
-    
-        while 1:
-            self._encHdrs = chr(len0) + chr(len1) + pubkey
-    
-            # add algorithms index
-            algInfo = chr(self._algosSes2.index(self.algoSes))
-    
-            # Create new session key
-            self._genNewSessKey()
-    
-            # add session key length
-            sessKeyLen = len(self.sessKey)
-            sessKeyLenL = sessKeyLen % 256
-            sessKeyLenH = sessKeyLen / 256
-            algInfo += chr(sessKeyLenL) + chr(sessKeyLenH)
-    
-            # add session IV length
-            sessIVLen = len(self.sessIV)
-            algInfo += chr(sessIVLen)
-            #alg += self.randfunc(self.pubBlkSize - 1) # add random chaff
-            #encAlgNum = self._encRawPub(alg)
-            encAlgEnc = self._encRawPub(self._padToPubBlkSize(algInfo))
-            if encAlgEnc == None:
-                continue
-            #encAlgLen = len(encAlgNum)
-            #self._encHdrs += chr(encAlgLen) + encAlgNum
-            self._encHdrs += encAlgEnc
-    
-            # ensure we can encrypt session key in one hit
-            if len(self.sessKey) > self.pubBlkSize:
-                raise Exception(
-                    "encStart: you need a bigger public key length")
-    
-            # encrypt and add session key
-            sKeyEnc = self._encRawPub(self._padToPubBlkSize(self.sessKey))
-            if sKeyEnc == None:
-                continue
-            # sKeyLen = len(sKeyEnc)
-            # self._encHdrs += chr(sKeyLen) + sKeyEnc
-            self._encHdrs += sKeyEnc
-    
-            # encrypt and add session cipher initial value
-            sCipherInit = self._encRawPub(self._padToPubBlkSize(self.sessIV))
-            if sCipherInit == None:
-                continue
-            # sCipherIVLen = len(sCipherInit)
-            # self._encHdrs += chr(sCipherIVLen) + sCipherInit
-            self._encHdrs += sCipherInit
-    
-            self._tstSessKey0 = self.sessKey
-            self._tstIV0 = self.sessIV
-    
-            # Create a new block cipher object
-            self._initBlkCipher()
-    
-            # ready to go!
-            self._encBuf = ''
-    
-            # success
-            break
-    
-    #@-body
-    #@-node:1::encStart()
-    #@+node:2::encNext()
-    #@+body
-    def encNext(self, raw=''):
-        """
-        Encrypt the next piece of data in a stream.
-    
-        Arguments:
-         - raw - raw piece of data to encrypt
-        Returns - one of:
-         - '' - not enough data to encrypt yet - stored for later
-         - encdata - string of encrypted data
-        """
-    
-        if raw == '':
-            return ''
-    
-        # grab any headers
-        enc = self._encHdrs
-        self._encHdrs = ''
-    
-        # add given string to our yet-to-be-encrypted buffer
-        self._encBuf += raw
-    
-        # Loop on data, breaking it up and encrypting it in blocks. Don't
-        # touch the last (n mod b) bytes in buffer, where n is total size and
-        # b is blocksize
-        size = len(self._encBuf)
-        next = 0
-        while next <= size - self.sesBlkSize: # skip trailing bytes for now
-            # extract next block
-            blk = self._encBuf[next:next+self.sesBlkSize]
-    
-            if self._tstBlk0 == '':
-                self._tstBlk0 = blk
-    
-            # encrypt block against session key
-            encpart = self.blkCipher.encrypt(blk)
-    
-            # add length byte and crypted block to internal buffer
-            enc += chr(self.sesBlkSize) + encpart
-    
-            next += self.sesBlkSize
-    
-        # ditch what we've consumed from buffer
-        self._encBuf = self._encBuf[next:]
-        
-        # return whatever we've encrypted so far
-        return enc
-    
-    #@-body
-    #@-node:2::encNext()
-    #@+node:3::encEnd()
-    #@+body
-    def encEnd(self):
-        """
-        Called to terminate a stream session.
-        Encrypts any remaining data in buffer.
-    
-        Arguments:
-         - None
-        Returns - one of:
-         - last block of data, as a string
-        """
-    
-        buf = ''
-        if self._encBuf == '':
-            # no trailing data - pass back empty packet
-            return chr(0)
-    
-        # break up remaining data into packets, and encrypt
-        while len(self._encBuf) > 0:
-    
-            # extract session blocksize worth of data from buf
-            blk = self._encBuf[0:self.sesBlkSize]
-            self._encBuf = self._encBuf[self.sesBlkSize:]
-            blklen = len(blk)
-    
-            # pad if needed
-            if blklen < self.sesBlkSize:
-                blk += self.randfunc(self.sesBlkSize - blklen)
-    
-            # encrypt against session key, and add
-            buf += chr(blklen)
-            buf += self.blkCipher.encrypt(blk)
-    
-        # clean up and get out
-        return buf
-    
-    #@-body
-    #@-node:3::encEnd()
-    #@+node:4::decStart()
-    #@+body
-    def decStart(self):
-        """
-        Start a stream decryption session.
-    
-        Call this method first, then feed in pieces of stream data into decNext until
-        there's no more data to decrypt
-    
-        Arguments:
-         - None
-        Returns:
-         - None
-        """
-    
-        # Start with fresh buffer and initial state
-        self._decBuf = ''
-        self._decState = 'p'
-        self._decEmpty = False
-    
-        self._tstSessKey1 = ''
-        self._tstIV1 = ''
-        self._tstBlk1 = ''
-    
-        # states - 'p'->awaiting public key
-        #          'c'->awaiting cipher index
-        #          'k'->awaiting session key
-        #          'i'->awaiting cipher initial data
-        #          'd'->awaiting data block
-    
-    #@-body
-    #@-node:4::decStart()
-    #@+node:5::decNext()
-    #@+body
-    def decNext(self, chunk):
-        """
-        Decrypt the next piece of incoming stream data.
-    
-        Arguments:
-         - chunk - some more of the encrypted stream
-        Returns (depending on state)
-         - '' - no more decrypted data available just yet
-         - data - the next available piece of decrypted data
-         - None - session is complete - no more data available
-        """
-    
-        if self._decEmpty:
-            return None
-    
-        # add chunk to our buffer
-        self._decBuf += chunk
-    
-        # bail out if nothing to do
-        chunklen = len(self._decBuf)
-        if chunklen < 2:
-            return ''
-    
-        # start with empty decryption buffer
-        decData = ''
-    
-        # loop around processing as much data as we can
-        #print "decNext: started"
-        while 1:
-            if self._decState == 'p':
-                size = ord(self._decBuf[0]) + 256 * ord(self._decBuf[1])
-                if chunklen < size + 2:
-                    # don't have full pubkey yet
-                    return ''
-                else:
-                    pubkey = self._decBuf[2:size+2]
-                    if not self._testPubKey(pubkey):
-                        raise Exception("Can't decrypt - public key mismatch")
-    
-                    self._decBuf = self._decBuf[size+2:]
-                    self._decState = 'c'
-                    continue
-    
-            if self._decState == 'd':
-    
-                #trace()
-    
-                # awaiting next data chunk
-                sizeReqd = self.sesBlkSize + 1
-                size = len(self._decBuf)
-                if size < sizeReqd:
-                    return decData
-                nbytes = ord(self._decBuf[0])
-                if nbytes == 0:
-                    self._decEmpty = True
-                    return None
-                blk = self._decBuf[1:sizeReqd]
-                self._decBuf = self._decBuf[sizeReqd:]
-                decBlk = self.blkCipher.decrypt(blk)
-                if self._tstBlk1 == '':
-                    self._tstBlk1 = decBlk
-                decBlk = decBlk[0:nbytes]
-                decData += decBlk
-                if nbytes < self.sesBlkSize:
-                    self._decEmpty = True
-                    return decData
-                continue
-    
-            if len(self._decBuf) < 2:
-                return decData
-    
-            sizeReqd = ord(self._decBuf[0]) + 256 * ord(self._decBuf[1]) + 2
-            size = len(self._decBuf)
-    
-            # bail if we have insufficient data
-            if size < sizeReqd:
-                return decData
-    
-            # extract length byte plus block
-            #blksize = sizeReqd - 1
-            #blk = self._decBuf[1:sizeReqd]
-            #self._decBuf = self._decBuf[sizeReqd:]
-            blk = self._decBuf[0:sizeReqd]
-            self._decBuf = self._decBuf[sizeReqd:]
-    
-            # state-dependent processing
-            if self._decState == 'c':
-                #print "decrypting cipher info"
-                # awaiting cipher info
-                blk = self._decRawPub(blk)
-    
-                # session cipher index
-                c = ord(blk[0])
-                self.algoSes = self._algosSes2[c]
-    
-                # session key len
-                self._tmpSessKeyLen = ord(blk[1]) + 256 * ord(blk[2])
-    
-                # session IV len
-                self._tmpSessIVLen = ord(blk[3])
-    
-                # ignore the rest - it's just chaff
-                self._decState = 'k'
-                continue
-    
-            elif self._decState == 'k':
-                # awaiting session key
-                #print "decrypting session key"
-                blk = self._decRawPub(blk)
-                self.sessKey = blk[0:self._tmpSessKeyLen]
-                self._tstSessKey1 = self.sessKey
-                self._decState = 'i'
-                continue
-    
-            elif self._decState == 'i':
-                # awaiting cipher start value
-                #print "decrypting IV"
-                blk = self._decRawPub(blk)
-                self.sessIV = blk[0:self._tmpSessIVLen]
-                self._tstIV1 = self.sessIV
-    
-                # Create cipher object, now we have what we need
-                self.blkCipher = self.algoSes.new(self.sessKey,
-                                                  getattr(self.algoSes, "MODE_CFB"),
-                                                  self.sessIV)
-                self._calcSesBlkSize()
-                self._decState = 'd'
-                continue
-    
-            else:
-                raise Exception(
-                    "decNext: strange state '%s'" % self._decState[0])
-    
-    #@-body
-    #@-node:5::decNext()
-    #@+node:6::decEnd()
-    #@+body
-    def decEnd(self):
-        """
-        Ends a stream decryption session.
-        """
-        # nothing really to do here - decNext() has taken care of it
-        # just reset internal state
-        self._decBuf = ''
-        self._decState = 'c'
-    
-    #@-body
-    #@-node:6::decEnd()
-    #@-node:15::Stream Methods
-    #@+node:16::Low Level
-    #@+node:1::_wrap()
-    #@+body
-    def _wrap(self, type, msg):
-        """
-        Encodes message as base64 and wraps with <StartPyCryptoname>/<EndPycryptoname>
-        Args:
-         - type - string to use in header/footer - eg 'Key', 'Message'
-         - msg - binary string to wrap
-        """
-        return "<StartPycrypto%s>\n%s<EndPycrypto%s>\n" \
-                 % (type, base64.encodestring(msg), type)
-    
-    #@-body
-    #@-node:1::_wrap()
-    #@+node:2::_unwrap()
-    #@+body
-    def _unwrap(self, type, msg):
-        """
-        Unwraps a previously _wrap()'ed message.
-        """
-        try:
-            #trace()
-            k1 = msg.split("<StartPycrypto%s>" % type, 1)
-            k2 = k1[1].split("<EndPycrypto%s>" % type)
-            k = k2[0]
-            #print "raw = "
-            #print k
-            bin = base64.decodestring(k)
-            return bin
-        except:
-            raise Exception("Tried to import Invalid %s" % type)
-            self._calcBlkSize()
-    
-    #@-body
-    #@-node:2::_unwrap()
-    #@+node:3::_calcPubBlkSize()
-    #@+body
-    def _calcPubBlkSize(self):
-        """
-        Determine size of public key
-        """
-        self.pubBlkSize = (self.k.size() - 7) / 8
-    
-    #@-body
-    #@-node:3::_calcPubBlkSize()
-    #@+node:4::_encRawPub()
-    #@+body
-    def _encRawPub(self, raw):
-        """
-        Encrypt a small raw string using the public key
-        algorithm. Input must not exceed the allowable
-        block size.
-    
-        Arguments:
-         - raw - small raw bit of string to encrypt
-        Returns:
-         - binary representation of encrypted chunk, or None if verify failed
-        """
-    
-        if len(raw) > self.pubBlkSize:
-            raise Exception(
-                "_encraw: max len %d, passed %d bytes" % (self.pubBlkSize, len(raw)))
-    
-        self.randpool.stir()
-        k = getPrime(128, self.randfunc)
-        s = self.k.encrypt(raw, k)
-        #d = self.k.decrypt(s)
-        #if d != raw:
-        #    #print "_encRawPub: decrypt verify fail"
-        #    return None
-    
-        #trace()
-    
-        # format this tuple into <len><nitems><item1len><item1bytes><item2len><item2bytes>...
-        enc = chr(len(s))
-        for item in s:
-            itemLen = len(item)
-            itemLenL = itemLen % 256
-            itemLenH = itemLen / 256
-            #enc += chr(len(item))
-            enc += chr(itemLenL) + chr(itemLenH)
-            enc += item
-        encLen = len(enc)
-        encLenL = encLen % 256
-        encLenH = encLen / 256
-        #enc = chr(len(enc)) + enc
-        enc = chr(encLenL) + chr(encLenH) + enc
-    
-        #d = self._decRawPub(enc)
-        #if d != raw:
-        #    print "panic:_encRawPub: decrypt verify fail!"
-            
-        return enc
-    
-    
-    #@-body
-    #@-node:4::_encRawPub()
-    #@+node:5::_decRawPub()
-    #@+body
-    def _decRawPub(self, enc):
-        """
-        Decrypt a public-key encrypted block, and return the decrypted string
-    
-        Arguments:
-         - enc - the encrypted string, in the format as created by _encRawPub()
-        Returns:
-         - decrypted block
-        """
-    
-        #trace()
-    
-        blklen = ord(enc[0]) + 256 * ord(enc[1])
-        nparts = ord(enc[2])
-        enc = enc[3:]
-    
-        if blklen != len(enc)+1:
-            raise Exception(
-                "_decRawPub: bad block length %d, should be %d" % (len(enc), blklen))
-        parts = []
-        for i in range(nparts):
-            partlen = ord(enc[0]) + 256 * ord(enc[1])
-            part = enc[2:partlen+2]
-            enc = enc[partlen+2:]
-            parts.append(part)
-        partsTuple = tuple(parts)
-        dec = self.k.decrypt(partsTuple)
-        return dec
-    
-    
-    
-    #@-body
-    #@-node:5::_decRawPub()
-    #@+node:6::_initBlkCipher()
-    #@+body
-    def _initBlkCipher(self):
-        """
-        Create a new block cipher object, set up with a new session key
-        and IV
-        """
-    
-        self.blkCipher = self.algoSes.new(self.sessKey,
-                                          getattr(self.algoSes, "MODE_CFB"),
-                                          self.sessIV)
-        self._calcSesBlkSize()
-    
-    #@-body
-    #@-node:6::_initBlkCipher()
-    #@+node:7::_calcSesBlkSize()
-    #@+body
-    def _calcSesBlkSize(self):
-        """
-        Determine size of session blocks
-        """
-        self.sesBlkSize = (self.blkCipher.block_size)
-    
-    #@-body
-    #@-node:7::_calcSesBlkSize()
-    #@+node:8::_testPubKey()
-    #@+body
-    def _testPubKey(self, k):
-        """
-        Checks if binary-encoded key matches this object's pubkey
-        """
-    
-        if k == self._rawPubKey():
-            return True
-        else:
-            return False
-    
-    #@-body
-    #@-node:8::_testPubKey()
-    #@+node:9::_rawPubKey()
-    #@+body
-    def _rawPubKey(self):
-        """
-        Returns a binary-encoded string of public key
-        """
-        return pickle.dumps((self.algoPname, self.k.publickey()), True)
-    
-    #@-body
-    #@-node:9::_rawPubKey()
-    #@+node:10::_padToPubBlkSize()
-    #@+body
-
-    def _padToPubBlkSize(self, raw):
-        """
-        padToPubBlkSize - pad a string to max size encryptable by public key
-    
-        Defence against factoring attacks that can uplift a session key when
-        that key is encrypted by itself against public key
-    
-        Arguments:
-         - raw - string to pad with random bytes
-        returns:
-         - padded string. Note - it is the responsibility of the decryption
-           code to know how much of the string to extract once decrypted.
-        """
-    
-        rawlen = len(raw)
-        extras = self.randfunc(self.pubBlkSize - rawlen)
-        #print "padToPubBlkSize: len=%d, added %d bytes of chaff :)" \
-        #      % (rawlen, len(extras))
-        return raw + extras
-    
-    #@-body
-    #@-node:10::_padToPubBlkSize()
-    #@+node:11::_genNewSessKey()
-    #@+body
-    def _genNewSessKey(self):
-        """
-        Generate a new random session key
-        """
-        self.randpool.stir()
-        self.sessKey = self.randfunc(32)
-        self.randpool.stir()
-        self.sessIV = self.randfunc(8)
-    
-    #@-body
-    #@-node:11::_genNewSessKey()
-    #@-node:16::Low Level
-    #@-others
-
-
-#@-body
-#@-node:3::class key
-#@-others
-
-
-
-#@-body
-#@-node:0::@file easy/ezPyCrypto.py
-#@-leo
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index c33036e183..ffea1ddc20 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -1,16 +1,15 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 """ The GUI """
-import sys, os, re, StringIO, traceback, time
+import os
 from PyQt4.QtCore import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, QSize, \
-                         QByteArray, QLocale, QUrl, QTranslator, QCoreApplication, \
-                         QModelIndex
+                         QByteArray, QUrl, QTranslator, QCoreApplication
 from PyQt4.QtGui import QFileDialog, QMessageBox, QPixmap, QFileIconProvider, \
-                        QIcon, QTableView, QDialogButtonBox, QApplication, QDialog
+                        QIcon, QTableView, QApplication, QDialog
 
 ORG_NAME = 'KovidsBrain'
 APP_UID  = 'libprs500'
-from calibre import __author__, islinux, iswindows, isosx
+from calibre import islinux, iswindows
 from calibre.startup import get_lang
 from calibre.utils.config import Config, ConfigProxy, dynamic
 import calibre.resources as resources
@@ -32,7 +31,7 @@ def _config():
               help=_('The format to use when saving single files to disk'))
     c.add_opt('confirm_delete', default=False,
               help=_('Confirm before deleting'))
-    c.add_opt('toolbar_icon_size', default=QSize(48, 48), 
+    c.add_opt('toolbar_icon_size', default=QSize(48, 48),
               help=_('Toolbar icon size')) # value QVariant.toSize
     c.add_opt('show_text_in_toolbar', default=True,
               help=_('Show button labels in the toolbar'))
@@ -57,16 +56,19 @@ def _config():
     c.add_opt('autolaunch_server', default=False, help=_('Automatically launch content server on application startup'))
     c.add_opt('oldest_news', default=60, help=_('Oldest news kept in database'))
     c.add_opt('systray_icon', default=True, help=_('Show system tray icon'))
-    c.add_opt('upload_news_to_device', default=True, 
+    c.add_opt('upload_news_to_device', default=True,
               help=_('Upload downloaded news to device'))
-    c.add_opt('delete_news_from_library_on_upload', default=False, 
+    c.add_opt('delete_news_from_library_on_upload', default=False,
               help=_('Delete books from library after uploading to device'))
-    c.add_opt('separate_cover_flow', default=False, 
+    c.add_opt('separate_cover_flow', default=False,
               help=_('Show the cover flow in a separate window instead of in the main calibre window'))
-    c.add_opt('disable_tray_notification', default=False, 
+    c.add_opt('disable_tray_notification', default=False,
               help=_('Disable notifications from the system tray icon'))
+    c.add_opt('default_send_to_device_action', default=None,
+            help=_('Default action to perform when send to device button is '
+                'clicked'))
     return ConfigProxy(c)
-    
+
 config = _config()
 # Turn off DeprecationWarnings in windows GUI
 if iswindows:
@@ -139,16 +141,16 @@ def human_readable(size):
 
 class Dispatcher(QObject):
     '''Convenience class to ensure that a function call always happens in the GUI thread'''
-    
+    SIGNAL = SIGNAL('dispatcher(PyQt_PyObject,PyQt_PyObject)')
+
     def __init__(self, func):
         QObject.__init__(self)
         self.func = func
-        self.connect(self, SIGNAL('edispatch(PyQt_PyObject, PyQt_PyObject)'), 
-                     self.dispatch, Qt.QueuedConnection)
-        
+        self.connect(self, self.SIGNAL, self.dispatch, Qt.QueuedConnection)
+
     def __call__(self, *args, **kwargs):
-        self.emit(SIGNAL('edispatch(PyQt_PyObject, PyQt_PyObject)'), args, kwargs)
-        
+        self.emit(self.SIGNAL, args, kwargs)
+
     def dispatch(self, args, kwargs):
         self.func(*args, **kwargs)
 
@@ -157,29 +159,29 @@ class GetMetadata(QObject):
     Convenience class to ensure that metadata readers are used only in the
     GUI thread. Must be instantiated in the GUI thread.
     '''
-    
+
     def __init__(self):
         QObject.__init__(self)
         self.connect(self, SIGNAL('edispatch(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
                      self._get_metadata, Qt.QueuedConnection)
         self.connect(self, SIGNAL('idispatch(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
                      self._from_formats, Qt.QueuedConnection)
-        
+
     def __call__(self, id, *args, **kwargs):
         self.emit(SIGNAL('edispatch(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
                   id, args, kwargs)
-    
+
     def from_formats(self, id, *args, **kwargs):
         self.emit(SIGNAL('idispatch(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
                   id, args, kwargs)
-    
+
     def _from_formats(self, id, args, kwargs):
         try:
             mi = metadata_from_formats(*args, **kwargs)
         except:
             mi = MetaInformation('', [_('Unknown')])
         self.emit(SIGNAL('metadataf(PyQt_PyObject, PyQt_PyObject)'), id, mi)
-    
+
     def _get_metadata(self, id, args, kwargs):
         try:
             mi = get_metadata(*args, **kwargs)
@@ -191,27 +193,27 @@ class TableView(QTableView):
     def __init__(self, parent):
         QTableView.__init__(self, parent)
         self.read_settings()
-        
+
     def read_settings(self):
         self.cw = dynamic[self.__class__.__name__+'column widths']
-    
+
     def write_settings(self):
         dynamic[self.__class__.__name__+'column widths'] = \
          tuple([int(self.columnWidth(i)) for i in range(self.model().columnCount(None))])
-    
+
     def restore_column_widths(self):
         if self.cw and len(self.cw):
             for i in range(len(self.cw)):
                 self.setColumnWidth(i, self.cw[i])
             return True
-    
+
 class FileIconProvider(QFileIconProvider):
-    
+
     ICONS = {
              'default' : 'unknown',
              'dir'     : 'dir',
              'zero'    : 'zero',
-             
+
              'jpeg'    : 'jpeg',
              'jpg'     : 'jpeg',
              'gif'     : 'gif',
@@ -234,7 +236,7 @@ class FileIconProvider(QFileIconProvider):
              'mobi'    : 'mobi',
              'epub'    : 'epub',
              }
-    
+
     def __init__(self):
         QFileIconProvider.__init__(self)
         self.icons = {}
@@ -242,14 +244,14 @@ class FileIconProvider(QFileIconProvider):
             self.icons[key] = ':/images/mimetypes/'+self.__class__.ICONS[key]+'.svg'
         for i in ('dir', 'default', 'zero'):
             self.icons[i] = QIcon(self.icons[i])
-    
+
     def key_from_ext(self, ext):
         key = ext if ext in self.icons.keys() else 'default'
         if key == 'default' and ext.count('.') > 0:
             ext = ext.rpartition('.')[2]
             key = ext if ext in self.icons.keys() else 'default'
         return key
-    
+
     def cached_icon(self, key):
         candidate = self.icons[key]
         if isinstance(candidate, QIcon):
@@ -257,11 +259,11 @@ class FileIconProvider(QFileIconProvider):
         icon = QIcon(candidate)
         self.icons[key] = icon
         return icon
-    
+
     def icon_from_ext(self, ext):
         key = self.key_from_ext(ext.lower() if ext else '')
         return self.cached_icon(key)
-    
+
     def load_icon(self, fileinfo):
         key = 'default'
         icons = self.icons
@@ -275,7 +277,7 @@ class FileIconProvider(QFileIconProvider):
             ext = qstring_to_unicode(fileinfo.completeSuffix()).lower()
             key = self.key_from_ext(ext)
         return self.cached_icon(key)
-    
+
     def icon(self, arg):
         if isinstance(arg, QFileInfo):
             return self.load_icon(arg)
@@ -284,13 +286,13 @@ class FileIconProvider(QFileIconProvider):
         if arg == QFileIconProvider.File:
             return self.icons['default']
         return QFileIconProvider.icon(self, arg)
-        
+
 _file_icon_provider = None
 def initialize_file_icon_provider():
     global _file_icon_provider
     if _file_icon_provider is None:
         _file_icon_provider = FileIconProvider()
-        
+
 def file_icon_provider():
     global _file_icon_provider
     return _file_icon_provider
@@ -299,13 +301,13 @@ _sidebar_directories = []
 def set_sidebar_directories(dirs):
     global _sidebar_directories
     if dirs is None:
-        dirs = config['frequently_used_directories']        
+        dirs = config['frequently_used_directories']
     _sidebar_directories = [QUrl.fromLocalFile(i) for i in dirs]
-        
+
 class FileDialog(QObject):
-    def __init__(self, title='Choose Files', 
+    def __init__(self, title='Choose Files',
                        filters=[],
-                       add_all_files_filter=True, 
+                       add_all_files_filter=True,
                        parent=None,
                        modal = True,
                        name = '',
@@ -321,16 +323,16 @@ class FileDialog(QObject):
                 ftext += '%s (%s);;'%(text, ' '.join(extensions))
         if add_all_files_filter or not ftext:
             ftext += 'All files (*)'
-        
+
         self.dialog_name = name if name else 'dialog_' + title
         self.selected_files = None
         self.fd = None
-        
+
         if islinux:
             self.fd = QFileDialog(parent)
-            self.fd.setFileMode(mode)  
+            self.fd.setFileMode(mode)
             self.fd.setIconProvider(_file_icon_provider)
-            self.fd.setModal(modal)            
+            self.fd.setModal(modal)
             self.fd.setNameFilter(ftext)
             self.fd.setWindowTitle(title)
             state = dynamic[self.dialog_name]
@@ -347,7 +349,7 @@ class FileDialog(QObject):
                 f = qstring_to_unicode(
                     QFileDialog.getSaveFileName(parent, title, dir, ftext, ""))
                 if os.path.exists(f):
-                    self.selected_files.append(f)                
+                    self.selected_files.append(f)
             elif mode == QFileDialog.ExistingFile:
                 f = qstring_to_unicode(
                     QFileDialog.getOpenFileName(parent, title, dir, ftext, ""))
@@ -367,44 +369,44 @@ class FileDialog(QObject):
             if self.selected_files:
                 self.selected_files = [qstring_to_unicode(q) for q in self.selected_files]
                 dynamic[self.dialog_name] =  os.path.dirname(self.selected_files[0])
-            self.accepted = bool(self.selected_files)        
-        
-        
-    
+            self.accepted = bool(self.selected_files)
+
+
+
     def get_files(self):
         if islinux and self.fd.result() != self.fd.Accepted:
-            return tuple() 
-        if self.selected_files is None:       
+            return tuple()
+        if self.selected_files is None:
             return tuple(os.path.abspath(qstring_to_unicode(i)) for i in self.fd.selectedFiles())
         return tuple(self.selected_files)
-    
+
     def save_dir(self):
         if self.fd:
             dynamic[self.dialog_name] =  self.fd.saveState()
-        
+
 
 def choose_dir(window, name, title):
-    fd = FileDialog(title, [], False, window, name=name, 
+    fd = FileDialog(title, [], False, window, name=name,
                     mode=QFileDialog.DirectoryOnly)
     dir = fd.get_files()
     if dir:
         return dir[0]
 
-def choose_files(window, name, title,  
+def choose_files(window, name, title,
                  filters=[], all_files=True, select_only_single_file=False):
     '''
     Ask user to choose a bunch of files.
     @param name: Unique dialog name used to store the opened directory
     @param title: Title to show in dialogs titlebar
     @param filters: list of allowable extensions. Each element of the list
-                     must be a 2-tuple with first element a string describing 
+                     must be a 2-tuple with first element a string describing
                      the type of files to be filtered and second element a list
-                     of extensions. 
+                     of extensions.
     @param all_files: If True add All files to filters.
-    @param select_only_single_file: If True only one file can be selected  
+    @param select_only_single_file: If True only one file can be selected
     '''
     mode = QFileDialog.ExistingFile if select_only_single_file else QFileDialog.ExistingFiles
-    fd = FileDialog(title=title, name=name, filters=filters, 
+    fd = FileDialog(title=title, name=name, filters=filters,
                     parent=window, add_all_files_filter=all_files, mode=mode,
                     )
     if fd.accepted:
@@ -413,8 +415,8 @@ def choose_files(window, name, title,
 
 def choose_images(window, name, title, select_only_single_file=True):
     mode = QFileDialog.ExistingFile if select_only_single_file else QFileDialog.ExistingFiles
-    fd = FileDialog(title=title, name=name, 
-                    filters=[('Images', ['png', 'gif', 'jpeg', 'jpg', 'svg'])], 
+    fd = FileDialog(title=title, name=name,
+                    filters=[('Images', ['png', 'gif', 'jpeg', 'jpg', 'svg'])],
                     parent=window, add_all_files_filter=False, mode=mode,
                     )
     if fd.accepted:
@@ -432,7 +434,7 @@ def pixmap_to_data(pixmap, format='JPEG'):
     return str(ba.data())
 
 class ResizableDialog(QDialog):
-    
+
     def __init__(self, *args, **kwargs):
         QDialog.__init__(self, *args)
         self.setupUi(self)
@@ -444,14 +446,15 @@ class ResizableDialog(QDialog):
         nh = min(self.height(), nh)
         nw = min(self.width(), nw)
         self.resize(nw, nh)
-        
+
 try:
     from calibre.utils.single_qt_application import SingleApplication
+    SingleApplication
 except:
     SingleApplication = None
-    
+
 class Application(QApplication):
-    
+
     def __init__(self, args):
         qargs = [i.encode('utf-8') if isinstance(i, unicode) else i for i in args]
         QApplication.__init__(self, qargs)
@@ -462,6 +465,6 @@ class Application(QApplication):
             if data:
                 self.translator.loadFromData(data)
                 self.installTranslator(self.translator)
-                
-         
-        
+
+
+
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index a77ec1beb4..de11366b3b 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1,19 +1,36 @@
+from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-import os, traceback, Queue, time
-from threading import Thread
+import os, traceback, Queue, time, socket
+from threading import Thread, RLock
+from itertools import repeat
+from functools import partial
+from binascii import unhexlify
+
+from PyQt4.Qt import QMenu, QAction, QActionGroup, QIcon, SIGNAL, QPixmap, \
+                     Qt
 
 from calibre.devices import devices
+from calibre.gui2.dialogs.choose_format import ChooseFormatDialog
 from calibre.parallel import Job
 from calibre.devices.scanner import DeviceScanner
+from calibre.gui2 import config, error_dialog, Dispatcher, dynamic, \
+                                   pixmap_to_data, warning_dialog
+from calibre.ebooks.metadata import authors_to_string
+from calibre.gui2.dialogs.conversion_error import ConversionErrorDialog
+from calibre.devices.interface import Device
+from calibre import sanitize_file_name, preferred_encoding
+from calibre.utils.filenames import ascii_filename
+from calibre.devices.errors import FreeSpaceError
+from calibre.utils.smtp import compose_mail, sendmail, extract_email_address, \
+        config as email_config
 
-        
 class DeviceJob(Job):
-    
+
     def __init__(self, func, *args, **kwargs):
         Job.__init__(self, *args, **kwargs)
         self.func = func
-        
+
     def run(self):
         self.start_work()
         try:
@@ -23,16 +40,12 @@ class DeviceJob(Job):
             self.traceback = traceback.format_exc()
         finally:
             self.job_done()
-        
+
 
 class DeviceManager(Thread):
-    '''
-    Worker thread that polls the USB ports for devices. Emits the
-    signal connected(PyQt_PyObject, PyQt_PyObject) on connection and
-    disconnection events.
-    '''
+
     def __init__(self, connected_slot, job_manager, sleep_time=2):
-        '''        
+        '''
         @param sleep_time: Time to sleep between device probes in millisecs
         @type sleep_time: integer
         '''
@@ -48,7 +61,7 @@ class DeviceManager(Thread):
         self.job_manager    = job_manager
         self.current_job    = None
         self.scanner        = DeviceScanner()
-        
+
     def detect_device(self):
         self.scanner.scan()
         for device in self.devices:
@@ -63,8 +76,8 @@ class DeviceManager(Thread):
                 except:
                     print 'Unable to open device'
                     traceback.print_exc()
-                finally:                        
-                    device[1] = True                    
+                finally:
+                    device[1] = True
             elif not connected and device[1]:
                 while True:
                     try:
@@ -75,14 +88,14 @@ class DeviceManager(Thread):
                 self.device = None
                 self.connected_slot(False)
                 device[1] ^= True
-                
+
     def next(self):
         if not self.jobs.empty():
             try:
                 return self.jobs.get_nowait()
             except Queue.Empty:
                 pass
-    
+
     def run(self):
         while self.keep_going:
             self.detect_device()
@@ -94,75 +107,80 @@ class DeviceManager(Thread):
                     self.current_job.run()
                     self.current_job = None
                 else:
-                    break 
+                    break
             time.sleep(self.sleep_time)
-            
+
     def create_job(self, func, done, description, args=[], kwargs={}):
-        job = DeviceJob(func, done, self.job_manager, 
+        job = DeviceJob(func, done, self.job_manager,
                         args=args, kwargs=kwargs, description=description)
         self.job_manager.add_job(job)
         self.jobs.put(job)
         return job
-    
+
+    def has_card(self):
+        try:
+            return bool(self.device.card_prefix())
+        except:
+            return False
+
     def _get_device_information(self):
         info = self.device.get_device_information(end_session=False)
         info = [i.replace('\x00', '').replace('\x01', '') for i in info]
         cp = self.device.card_prefix(end_session=False)
         fs = self.device.free_space()
         return info, cp, fs
-    
+
     def get_device_information(self, done):
         '''Get device information and free space on device'''
-        return self.create_job(self._get_device_information, done, 
+        return self.create_job(self._get_device_information, done,
                     description=_('Get device information'))
-        
-    
+
     def _books(self):
         '''Get metadata from device'''
         mainlist = self.device.books(oncard=False, end_session=False)
         cardlist = self.device.books(oncard=True)
         return (mainlist, cardlist)
-    
+
     def books(self, done):
         '''Return callable that returns the list of books on device as two booklists'''
         return self.create_job(self._books, done, description=_('Get list of books on device'))
-    
+
     def _sync_booklists(self, booklists):
         '''Sync metadata to device'''
         self.device.sync_booklists(booklists, end_session=False)
         return self.device.card_prefix(end_session=False), self.device.free_space()
-    
+
     def sync_booklists(self, done, booklists):
         return self.create_job(self._sync_booklists, done, args=[booklists],
                         description=_('Send metadata to device'))
-    
+
     def _upload_books(self, files, names, on_card=False, metadata=None):
         '''Upload books to device: '''
-        return self.device.upload_books(files, names, on_card, 
+        return self.device.upload_books(files, names, on_card,
                                         metadata=metadata, end_session=False)
-        
-    def upload_books(self, done, files, names, on_card=False, titles=None, 
+
+    def upload_books(self, done, files, names, on_card=False, titles=None,
                      metadata=None):
         desc = _('Upload %d books to device')%len(names)
         if titles:
             desc += u':' + u', '.join(titles)
-        return self.create_job(self._upload_books, done, args=[files, names], 
+        return self.create_job(self._upload_books, done, args=[files, names],
                 kwargs={'on_card':on_card,'metadata':metadata}, description=desc)
-        
+
     def add_books_to_metadata(self, locations, metadata, booklists):
         self.device.add_books_to_metadata(locations, metadata, booklists)
-    
+
     def _delete_books(self, paths):
         '''Remove books from device'''
         self.device.delete_books(paths, end_session=True)
-        
+
     def delete_books(self, done, paths):
         return self.create_job(self._delete_books, done, args=[paths],
                         description=_('Delete books from device'))
-    
+
     def remove_books_from_metadata(self, paths, booklists):
         self.device.remove_books_from_metadata(paths, booklists)
-        
+
     def _save_books(self, paths, target):
         '''Copy books from device to disk'''
         for path in paths:
@@ -170,18 +188,502 @@ class DeviceManager(Thread):
             f = open(os.path.join(target, name), 'wb')
             self.device.get_file(path, f)
             f.close()
-        
+
     def save_books(self, done, paths, target):
         return self.create_job(self._save_books, done, args=[paths, target],
                         description=_('Download books from device'))
-    
+
     def _view_book(self, path, target):
         f = open(target, 'wb')
         self.device.get_file(path, f)
         f.close()
         return target
-    
+
     def view_book(self, done, path, target):
         return self.create_job(self._view_book, done, args=[path, target],
                         description=_('View book on device'))
-        
\ No newline at end of file
+
+
+class DeviceAction(QAction):
+
+    def __init__(self, dest, delete, specific, icon_path, text, parent=None):
+        if delete:
+            text += ' ' + _('and delete from library')
+        QAction.__init__(self, QIcon(icon_path), text, parent)
+        self.dest = dest
+        self.delete = delete
+        self.specific = specific
+        self.connect(self, SIGNAL('triggered(bool)'),
+                lambda x : self.emit(SIGNAL('a_s(QAction)'), self))
+
+    def __repr__(self):
+        return self.__class__.__name__ + ':%s:%s:%s'%(self.dest, self.delete,
+                self.specific)
+
+
+class DeviceMenu(QMenu):
+
+    def __init__(self, parent=None):
+        QMenu.__init__(self, parent)
+        self.group = QActionGroup(self)
+        self.actions = []
+        self._memory = []
+
+        self.set_default_menu = self.addMenu(_('Set default send to device'
+            ' action'))
+        opts = email_config().parse()
+        default_account = None
+        if opts.accounts:
+            self.email_to_menu = self.addMenu(_('Email to')+'...')
+            keys = sorted(opts.accounts.keys())
+            for account in keys:
+                formats, auto, default = opts.accounts[account]
+                dest = 'mail:'+account+';'+formats
+                if default:
+                    default_account = (dest, False, False, ':/images/mail.svg',
+                            _('Email to')+' '+account)
+                action1 = DeviceAction(dest, False, False, ':/images/mail.svg',
+                        _('Email to')+' '+account, self)
+                action2 = DeviceAction(dest, True, False, ':/images/mail.svg',
+                        _('Email to')+' '+account, self)
+                map(self.email_to_menu.addAction, (action1, action2))
+                map(self._memory.append, (action1, action2))
+                self.email_to_menu.addSeparator()
+                self.connect(action1, SIGNAL('a_s(QAction)'),
+                            self.action_triggered)
+                self.connect(action2, SIGNAL('a_s(QAction)'),
+                            self.action_triggered)
+
+
+
+
+        _actions = [
+                ('main:', False, False,  ':/images/reader.svg',
+                    _('Send to main memory')),
+                ('card:0', False, False, ':/images/sd.svg',
+                    _('Send to storage card')),
+                '-----',
+                ('main:', True, False,   ':/images/reader.svg',
+                    _('Send to main memory')),
+                ('card:0', True, False,  ':/images/sd.svg',
+                    _('Send to storage card')),
+                '-----',
+                ('main:', False, True,  ':/images/reader.svg',
+                    _('Send specific format to main memory')),
+                ('card:0', False, True, ':/images/sd.svg',
+                    _('Send specific format to storage card')),
+
+                ]
+        if default_account is not None:
+            _actions.insert(2, default_account)
+            _actions.insert(6, list(default_account))
+            _actions[6][1] = True
+        for round in (0, 1):
+            for dest, delete, specific, icon, text in _actions:
+                if dest == '-':
+                    (self.set_default_menu if round else self).addSeparator()
+                    continue
+                action = DeviceAction(dest, delete, specific, icon, text, self)
+                self._memory.append(action)
+                if round == 1:
+                    action.setCheckable(True)
+                    action.setText(action.text())
+                    self.group.addAction(action)
+                    self.set_default_menu.addAction(action)
+                else:
+                    self.connect(action, SIGNAL('a_s(QAction)'),
+                            self.action_triggered)
+                    self.actions.append(action)
+                    self.addAction(action)
+
+
+        da = config['default_send_to_device_action']
+        done = False
+        for action in self.group.actions():
+            if repr(action) == da:
+                action.setChecked(True)
+                done = True
+                break
+        if not done:
+            action = list(self.group.actions())[0]
+            action.setChecked(True)
+            config['default_send_to_device_action'] = repr(action)
+
+        self.connect(self.group, SIGNAL('triggered(QAction*)'),
+                self.change_default_action)
+        self.enable_device_actions(False)
+        if opts.accounts:
+            self.addSeparator()
+            self.addMenu(self.email_to_menu)
+
+    def change_default_action(self, action):
+        config['default_send_to_device_action'] = repr(action)
+        action.setChecked(True)
+
+    def action_triggered(self, action):
+        self.emit(SIGNAL('sync(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
+                action.dest, action.delete, action.specific)
+
+    def trigger_default(self, *args):
+        r = config['default_send_to_device_action']
+        for action in self.actions:
+            if repr(action) == r:
+                self.action_triggered(action)
+                break
+
+    def enable_device_actions(self, enable):
+        for action in self.actions:
+            if action.dest[:4] in ('main', 'card'):
+                action.setEnabled(enable)
+
+class Emailer(Thread):
+
+    def __init__(self, timeout=60):
+        Thread.__init__(self)
+        self.setDaemon(True)
+        self.job_lock = RLock()
+        self.jobs = []
+        self._run = True
+        self.timeout = timeout
+
+    def run(self):
+        while self._run:
+            job = None
+            with self.job_lock:
+                if self.jobs:
+                    job = self.jobs[0]
+                    self.jobs = self.jobs[1:]
+            if job is not None:
+                self._send_mails(*job)
+            time.sleep(1)
+
+    def stop(self):
+        self._run = False
+
+    def send_mails(self, jobnames, callback, attachments, to_s, subjects,
+                  texts, attachment_names):
+        job = (jobnames, callback, attachments, to_s, subjects, texts,
+                attachment_names)
+        with self.job_lock:
+            self.jobs.append(job)
+
+    def _send_mails(self, jobnames, callback, attachments,
+                    to_s, subjects, texts, attachment_names):
+        opts = email_config().parse()
+        opts.verbose = 3 if os.environ.get('CALIBRE_DEBUG_EMAIL', False) else 0
+        from_ = opts.from_
+        if not from_:
+            from_ = 'calibre <calibre@'+socket.getfqdn()+'>'
+        results = []
+        for i, jobname in enumerate(jobnames):
+            try:
+                msg = compose_mail(from_, to_s[i], texts[i], subjects[i],
+                        open(attachments[i], 'rb'),
+                        attachment_name = attachment_names[i])
+                efrom, eto = map(extract_email_address, (from_, to_s[i]))
+                eto = [eto]
+                sendmail(msg, efrom, eto, localhost=None,
+                            verbose=opts.verbose,
+                            timeout=self.timeout, relay=opts.relay_host,
+                            username=opts.relay_username,
+                            password=unhexlify(opts.relay_password), port=opts.relay_port,
+                            encryption=opts.encryption)
+                results.append([jobname, None, None])
+            except Exception, e:
+                results.append([jobname, e, traceback.format_exc()])
+        callback(results)
+
+
+class DeviceGUI(object):
+
+    def dispatch_sync_event(self, dest, delete, specific):
+        rows = self.library_view.selectionModel().selectedRows()
+        if not rows or len(rows) == 0:
+            error_dialog(self, _('No books'), _('No books')+' '+\
+                    _('selected to send')).exec_()
+            return
+
+        fmt = None
+        if specific:
+            d = ChooseFormatDialog(self, _('Choose format to send to device'),
+                                self.device_manager.device_class.FORMATS)
+            d.exec_()
+            fmt = d.format().lower()
+        dest, sub_dest = dest.split(':')
+        if dest in ('main', 'card'):
+            if not self.device_connected or not self.device_manager:
+                error_dialog(self, _('No device'),
+                        _('Cannot send: No device is connected')).exec_()
+                return
+            on_card = dest == 'card'
+            if on_card and not self.device_manager.has_card():
+                error_dialog(self, _('No card'),
+                        _('Cannot send: Device has no storage card')).exec_()
+                return
+            self.sync_to_device(on_card, delete, fmt)
+        elif dest == 'mail':
+            to, fmts = sub_dest.split(';')
+            fmts = [x.strip().lower() for x in fmts.split(',')]
+            self.send_by_mail(to, fmts, delete)
+
+    def send_by_mail(self, to, fmts, delete_from_library):
+        rows = self.library_view.selectionModel().selectedRows()
+        if not rows or len(rows) == 0:
+            return
+        ids = iter(self.library_view.model().id(r) for r in rows)
+        full_metadata = self.library_view.model().get_metadata(
+                                        rows, full_metadata=True)[-1]
+        files = self.library_view.model().get_preferred_formats(rows,
+                                    fmts, paths=True, set_metadata=True)
+        files = [getattr(f, 'name', None) for f in files]
+
+        bad, remove_ids, jobnames = [], [], []
+        texts, subjects, attachments, attachment_names = [], [], [], []
+        for f, mi, id in zip(files, full_metadata, ids):
+            t = mi.title
+            if not t:
+                t = _('Unknown')
+            if f is None:
+                bad.append(t)
+            else:
+                remove_ids.append(id)
+                jobnames.append(u'%s:%s'%(id, t))
+                attachments.append(f)
+                subjects.append(_('E-book:')+ ' '+t)
+                a = authors_to_string(mi.authors if mi.authors else \
+                        [_('Unknown')])
+                texts.append(_('Attached, you will find the e-book') + \
+                        '\n\n' + t + '\n\t' + _('by') + ' ' + a + '\n\n' + \
+                        _('in the %s format.') %
+                        os.path.splitext(f)[1][1:].upper())
+                prefix = sanitize_file_name(t+' - '+a)
+                if not isinstance(prefix, unicode):
+                    prefix = prefix.decode(preferred_encoding, 'replace')
+                attachment_names.append(prefix + os.path.splitext(f)[1])
+        remove = remove_ids if delete_from_library else []
+
+        to_s = list(repeat(to, len(attachments)))
+        if attachments:
+            self.emailer.send_mails(jobnames,
+                    Dispatcher(partial(self.emails_sent, remove=remove)),
+                    attachments, to_s, subjects, texts, attachment_names)
+            self.status_bar.showMessage(_('Sending email to')+' '+to, 3000)
+
+        if bad:
+            bad = '\n'.join('<li>%s</li>'%(i,) for i in bad)
+            d = warning_dialog(self, _('No suitable formats'),
+                '<p>'+ _('Could not email the following books '
+                'as no suitable formats were found:<br><ul>%s</ul>')%(bad,))
+            d.exec_()
+
+    def emails_sent(self, results, remove=[]):
+        errors, good = [], []
+        for jobname, exception, tb in results:
+            id = jobname.partition(':')[0]
+            title = jobname.partition(':')[-1]
+            if exception is not None:
+                errors.append([title, exception, tb])
+            else:
+                good.append(title)
+        if errors:
+            errors = '\n'.join([
+                    '<li><b>%s</b><br>%s<br>%s<br></li>' %
+                    (title, e, tb.replace('\n', '<br>')) for \
+                            title, e, tb in errors
+                    ])
+            ConversionErrorDialog(self, _('Failed to email books'),
+                    '<p>'+_('Failed to email the following books:')+\
+                            '<ul>%s</ul>'%errors,
+                        show=True)
+        else:
+            self.status_bar.showMessage(_('Sent by email:') + ', '.join(good),
+                    5000)
+
+    def cover_to_thumbnail(self, data):
+        p = QPixmap()
+        p.loadFromData(data)
+        if not p.isNull():
+            ht = self.device_manager.device_class.THUMBNAIL_HEIGHT \
+                    if self.device_manager else Device.THUMBNAIL_HEIGHT
+            p = p.scaledToHeight(ht, Qt.SmoothTransformation)
+            return (p.width(), p.height(), pixmap_to_data(p))
+
+    def email_news(self, id):
+        opts = email_config().parse()
+        accounts = [(account, [x.strip().lower() for x in x[0].split(',')])
+                for account, x in opts.accounts.items() if x[1]]
+        sent_mails = []
+        for account, fmts in accounts:
+            files = self.library_view.model().\
+                    get_preferred_formats_from_ids([id], fmts)
+            files = [f.name for f in files if f is not None]
+            if not files:
+                continue
+            attachment = files[0]
+            mi = self.library_view.model().db.get_metadata(id,
+                    index_is_id=True)
+            to_s = [account]
+            subjects = [_('News:')+' '+mi.title]
+            texts    = [_('Attached is the')+' '+mi.title]
+            attachment_names = [mi.title+os.path.splitext(attachment)[1]]
+            attachments = [attachment]
+            jobnames = ['%s:%s'%(id, mi.title)]
+            remove = [id] if config['delete_news_from_library_on_upload']\
+                    else []
+            self.emailer.send_mails(jobnames,
+                    Dispatcher(partial(self.emails_sent, remove=remove)),
+                    attachments, to_s, subjects, texts, attachment_names)
+            sent_mails.append(to_s[0])
+        if sent_mails:
+            self.status_bar.showMessage(_('Sent news to')+' '+\
+                    ', '.join(sent_mails),  3000)
+
+
+    def sync_news(self):
+        if self.device_connected:
+            ids = list(dynamic.get('news_to_be_synced', set([])))
+            ids = [id for id in ids if self.library_view.model().db.has_id(id)]
+            files = self.library_view.model().get_preferred_formats_from_ids(
+                                ids, self.device_manager.device_class.FORMATS)
+            files = [f for f in files if f is not None]
+            if not files:
+                dynamic.set('news_to_be_synced', set([]))
+                return
+            metadata = self.library_view.model().get_metadata(ids,
+                    rows_are_ids=True)
+            names = []
+            for mi in metadata:
+                prefix = sanitize_file_name(mi['title'])
+                if not isinstance(prefix, unicode):
+                    prefix = prefix.decode(preferred_encoding, 'replace')
+                prefix = ascii_filename(prefix)
+                names.append('%s_%d%s'%(prefix, id,
+                    os.path.splitext(f.name)[1]))
+                cdata = mi['cover']
+                if cdata:
+                    mi['cover'] = self.cover_to_thumbnail(cdata)
+            dynamic.set('news_to_be_synced', set([]))
+            if config['upload_news_to_device'] and files:
+                remove = ids if \
+                    config['delete_news_from_library_on_upload'] else []
+                on_card = self.location_view.model().free[0] < \
+                          self.location_view.model().free[1]
+                self.upload_books(files, names, metadata,
+                        on_card=on_card,
+                        memory=[[f.name for f in files], remove])
+                self.status_bar.showMessage(_('Sending news to device.'), 5000)
+
+
+    def sync_to_device(self, on_card, delete_from_library,
+            specific_format=None):
+        rows = self.library_view.selectionModel().selectedRows()
+        if not self.device_manager or not rows or len(rows) == 0:
+            return
+        ids = iter(self.library_view.model().id(r) for r in rows)
+        metadata = self.library_view.model().get_metadata(rows)
+        for mi in metadata:
+            cdata = mi['cover']
+            if cdata:
+                mi['cover'] = self.cover_to_thumbnail(cdata)
+        metadata = iter(metadata)
+        _files   = self.library_view.model().get_preferred_formats(rows,
+                                    self.device_manager.device_class.FORMATS,
+                                    paths=True, set_metadata=True,
+                                    specific_format=specific_format)
+        files = [getattr(f, 'name', None) for f in _files]
+        bad, good, gf, names, remove_ids = [], [], [], [], []
+        for f in files:
+            mi = metadata.next()
+            id = ids.next()
+            if f is None:
+                bad.append(mi['title'])
+            else:
+                remove_ids.append(id)
+                good.append(mi)
+                gf.append(f)
+                t = mi['title']
+                if not t:
+                    t = _('Unknown')
+                a = mi['authors']
+                if not a:
+                    a = _('Unknown')
+                prefix = sanitize_file_name(t+' - '+a)
+                if not isinstance(prefix, unicode):
+                    prefix = prefix.decode(preferred_encoding, 'replace')
+                prefix = ascii_filename(prefix)
+                names.append('%s_%d%s'%(prefix, id, os.path.splitext(f)[1]))
+        remove = remove_ids if delete_from_library else []
+        self.upload_books(gf, names, good, on_card, memory=(_files, remove))
+        self.status_bar.showMessage(_('Sending books to device.'), 5000)
+        if bad:
+            bad = '\n'.join('<li>%s</li>'%(i,) for i in bad)
+            d = warning_dialog(self, _('No suitable formats'),
+                    _('Could not upload the following books to the device, '
+                'as no suitable formats were found:<br><ul>%s</ul>')%(bad,))
+            d.exec_()
+
+    def upload_booklists(self):
+        '''
+        Upload metadata to device.
+        '''
+        self.device_manager.sync_booklists(Dispatcher(self.metadata_synced),
+                                           self.booklists())
+
+    def metadata_synced(self, job):
+        '''
+        Called once metadata has been uploaded.
+        '''
+        if job.exception is not None:
+            self.device_job_exception(job)
+            return
+        cp, fs = job.result
+        self.location_view.model().update_devices(cp, fs)
+
+    def upload_books(self, files, names, metadata, on_card=False, memory=None):
+        '''
+        Upload books to device.
+        :param files: List of either paths to files or file like objects
+        '''
+        titles = [i['title'] for i in metadata]
+        job = self.device_manager.upload_books(
+                Dispatcher(self.books_uploaded),
+                files, names, on_card=on_card,
+                metadata=metadata, titles=titles
+              )
+        self.upload_memory[job] = (metadata, on_card, memory, files)
+
+    def books_uploaded(self, job):
+        '''
+        Called once books have been uploaded.
+        '''
+        metadata, on_card, memory, files = self.upload_memory.pop(job)
+
+        if job.exception is not None:
+            if isinstance(job.exception, FreeSpaceError):
+                where = 'in main memory.' if 'memory' in str(job.exception) \
+                        else 'on the storage card.'
+                titles = '\n'.join(['<li>'+mi['title']+'</li>' \
+                                    for mi in metadata])
+                d = error_dialog(self, _('No space on device'),
+                                 _('<p>Cannot upload books to device there '
+                                 'is no more free space available ')+where+
+                                 '</p>\n<ul>%s</ul>'%(titles,))
+                d.exec_()
+            else:
+                self.device_job_exception(job)
+            return
+
+        self.device_manager.add_books_to_metadata(job.result,
+                metadata, self.booklists())
+
+        self.upload_booklists()
+
+        view = self.card_view if on_card else self.memory_view
+        view.model().resort(reset=False)
+        view.model().research()
+        for f in files:
+            getattr(f, 'close', lambda : True)()
+        if memory and memory[1]:
+            self.library_view.model().delete_books_by_id(memory[1])
+
+
diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py
index 9958ce53fa..91bc988a22 100644
--- a/src/calibre/gui2/dialogs/config.py
+++ b/src/calibre/gui2/dialogs/config.py
@@ -1,15 +1,17 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-import os, re, time, textwrap
+import os, re, time, textwrap, sys, cStringIO
+from binascii import hexlify, unhexlify
 
 from PyQt4.Qt import    QDialog, QMessageBox, QListWidgetItem, QIcon, \
                         QDesktopServices, QVBoxLayout, QLabel, QPlainTextEdit, \
-                        QStringListModel, QAbstractItemModel, \
+                        QStringListModel, QAbstractItemModel, QFont, \
                         SIGNAL, QTimer, Qt, QSize, QVariant, QUrl, \
-                        QModelIndex, QInputDialog
+                        QModelIndex, QInputDialog, QAbstractTableModel
 
 from calibre.constants import islinux, iswindows
 from calibre.gui2.dialogs.config_ui import Ui_Dialog
+from calibre.gui2.dialogs.test_email_ui import Ui_Dialog as TE_Dialog
 from calibre.gui2 import qstring_to_unicode, choose_dir, error_dialog, config, \
                          ALL_COLUMNS, NONE, info_dialog, choose_files
 from calibre.utils.config import prefs
@@ -21,14 +23,15 @@ from calibre.library import server_config
 from calibre.customize.ui import initialized_plugins, is_disabled, enable_plugin, \
                                  disable_plugin, customize_plugin, \
                                  plugin_customization, add_plugin, remove_plugin
+from calibre.utils.smtp import config as smtp_prefs
 
 class PluginModel(QAbstractItemModel):
-    
+
     def __init__(self, *args):
         QAbstractItemModel.__init__(self, *args)
         self.icon = QVariant(QIcon(':/images/plugins.svg'))
         self.populate()
-        
+
     def populate(self):
         self._data = {}
         for plugin in initialized_plugins():
@@ -37,21 +40,21 @@ class PluginModel(QAbstractItemModel):
             else:
                 self._data[plugin.type].append(plugin)
         self.categories = sorted(self._data.keys())
-        
+
     def index(self, row, column, parent):
         if not self.hasIndex(row, column, parent):
             return QModelIndex()
-        
+
         if parent.isValid():
             return self.createIndex(row, column, parent.row())
         else:
             return self.createIndex(row, column, -1)
-        
+
     def parent(self, index):
         if not index.isValid() or index.internalId() == -1:
             return QModelIndex()
         return self.createIndex(index.internalId(), 0, -1)
-    
+
     def rowCount(self, parent):
         if not parent.isValid():
             return len(self.categories)
@@ -59,14 +62,14 @@ class PluginModel(QAbstractItemModel):
             category = self.categories[parent.row()]
             return len(self._data[category])
         return 0
-    
+
     def columnCount(self, parent):
         return 1
-    
+
     def index_to_plugin(self, index):
         category = self.categories[index.parent().row()]
         return self._data[category][index.row()]
-    
+
     def plugin_to_index(self, plugin):
         for i, category in enumerate(self.categories):
             parent = self.index(i, 0, QModelIndex())
@@ -74,13 +77,13 @@ class PluginModel(QAbstractItemModel):
                 if plugin == p:
                     return self.index(j, 0, parent)
         return QModelIndex()
-    
+
     def refresh_plugin(self, plugin, rescan=False):
         if rescan:
             self.populate()
         idx = self.plugin_to_index(plugin)
         self.emit(SIGNAL('dataChanged(QModelIndex,QModelIndex)'), idx, idx)
-    
+
     def flags(self, index):
         if not index.isValid():
             return 0
@@ -90,7 +93,7 @@ class PluginModel(QAbstractItemModel):
         if not is_disabled(self.data(index, Qt.UserRole)):
             flags |= Qt.ItemIsEnabled
         return flags
-            
+
     def data(self, index, role):
         if not index.isValid():
             return NONE
@@ -113,25 +116,167 @@ class PluginModel(QAbstractItemModel):
             if role == Qt.UserRole:
                 return plugin
         return NONE
-                
-            
+
+
 
 class CategoryModel(QStringListModel):
-    
+
     def __init__(self, *args):
         QStringListModel.__init__(self, *args)
-        self.setStringList([_('General'), _('Interface'), _('Advanced'), 
-                            _('Content\nServer'), _('Plugins')])
-        self.icons = list(map(QVariant, map(QIcon, 
-            [':/images/dialog_information.svg', ':/images/lookfeel.svg', 
-             ':/images/view.svg', ':/images/network-server.svg',
-             ':/images/plugins.svg'])))
-    
+        self.setStringList([_('General'), _('Interface'), _('Email\nDelivery'),
+                            _('Advanced'), _('Content\nServer'), _('Plugins')])
+        self.icons = list(map(QVariant, map(QIcon,
+            [':/images/dialog_information.svg', ':/images/lookfeel.svg',
+             ':/images/mail.svg', ':/images/view.svg',
+             ':/images/network-server.svg', ':/images/plugins.svg'])))
+
     def data(self, index, role):
         if role == Qt.DecorationRole:
             return self.icons[index.row()]
         return QStringListModel.data(self, index, role)
-            
+
+class TestEmail(QDialog, TE_Dialog):
+
+    def __init__(self, accounts, parent):
+        QDialog.__init__(self, parent)
+        TE_Dialog.__init__(self)
+        self.setupUi(self)
+        opts = smtp_prefs().parse()
+        self.test_func = parent.test_email_settings
+        self.connect(self.test_button, SIGNAL('clicked(bool)'), self.test)
+        self.from_.setText(unicode(self.from_.text())%opts.from_)
+        if accounts:
+            self.to.setText(list(accounts.keys())[0])
+        if opts.relay_host:
+            self.label.setText(_('Using: %s:%s@%s:%s and %s encryption')%
+                    (opts.relay_username, unhexlify(opts.relay_password),
+                        opts.relay_host, opts.relay_port, opts.encryption))
+
+    def test(self):
+        self.log.setPlainText(_('Sending...'))
+        self.test_button.setEnabled(False)
+        try:
+            tb = self.test_func(unicode(self.to.text()))
+            if not tb:
+                tb = _('Mail successfully sent')
+            self.log.setPlainText(tb)
+        finally:
+            self.test_button.setEnabled(True)
+
+class EmailAccounts(QAbstractTableModel):
+
+    def __init__(self, accounts):
+        QAbstractTableModel.__init__(self)
+        self.accounts = accounts
+        self.account_order = sorted(self.accounts.keys())
+        self.headers  = map(QVariant, [_('Email'), _('Formats'), _('Auto send')])
+        self.default_font = QFont()
+        self.default_font.setBold(True)
+        self.default_font = QVariant(self.default_font)
+        self.tooltips =[NONE] + map(QVariant,
+            [_('Formats to email. The first matching format will be sent.'),
+             '<p>'+_('If checked, downloaded news will be automatically '
+                     'mailed <br>to this email address '
+                     '(provided it is in one of the listed formats).')])
+
+    def rowCount(self, *args):
+        return len(self.account_order)
+
+    def columnCount(self, *args):
+        return 3
+
+    def headerData(self, section, orientation, role):
+        if role == Qt.DisplayRole and orientation == Qt.Horizontal:
+            return self.headers[section]
+        return NONE
+
+    def data(self, index, role):
+        row, col = index.row(), index.column()
+        if row < 0 or row >= self.rowCount():
+            return NONE
+        account = self.account_order[row]
+        if role == Qt.UserRole:
+            return (account, self.accounts[account])
+        if role == Qt.ToolTipRole:
+            return self.tooltips[col]
+        if role == Qt.DisplayRole:
+            if col == 0:
+                return QVariant(account)
+            if col ==  1:
+                return QVariant(self.accounts[account][0])
+        if role == Qt.FontRole and self.accounts[account][2]:
+            return self.default_font
+        if role == Qt.CheckStateRole and col == 2:
+            return QVariant(Qt.Checked if self.accounts[account][1] else Qt.Unchecked)
+        return NONE
+
+    def flags(self, index):
+        if index.column() == 2:
+            return QAbstractTableModel.flags(self, index)|Qt.ItemIsUserCheckable
+        else:
+            return QAbstractTableModel.flags(self, index)|Qt.ItemIsEditable
+
+    def setData(self, index, value, role):
+        if not index.isValid():
+            return False
+        row, col = index.row(), index.column()
+        account = self.account_order[row]
+        if col == 2:
+            self.accounts[account][1] ^= True
+        elif col == 1:
+            self.accounts[account][0] = unicode(value.toString()).upper()
+        else:
+            na = unicode(value.toString())
+            from email.utils import parseaddr
+            addr = parseaddr(na)[-1]
+            if not addr:
+                return False
+            self.accounts[na] = self.accounts.pop(account)
+            self.account_order[row] = na
+            if '@kindle.com' in addr:
+                self.accounts[na][0] = 'AZW, MOBI, TPZ, PRC, AZW1'
+
+        self.emit(SIGNAL('dataChanged(QModelIndex,QModelIndex)'),
+                self.index(index.row(), 0), self.index(index.row(), 2))
+        return True
+
+    def make_default(self, index):
+        if index.isValid():
+            row = index.row()
+            for x in self.accounts.values():
+                x[2] = False
+            self.accounts[self.account_order[row]][2] = True
+            self.reset()
+
+    def add(self):
+        x = _('new email address')
+        y = x
+        c = 0
+        while y in self.accounts:
+            c += 1
+            y = x + str(c)
+        self.accounts[y] = ['MOBI, EPUB', True,
+                                                len(self.account_order) == 0]
+        self.account_order = sorted(self.accounts.keys())
+        self.reset()
+        return self.index(self.account_order.index(y), 0)
+
+    def remove(self, index):
+        if index.isValid():
+            row = self.index.row()
+            account = self.account_order[row]
+            self.accounts.pop(account)
+            self.account_order = sorted(self.accounts.keys())
+            has_default = False
+            for account in self.account_order:
+                if self.accounts[account][2]:
+                    has_default = True
+                    break
+            if not has_default and self.account_order:
+                self.accounts[self.account_order[0]][2] = True
+
+            self.reset()
+
 
 class ConfigDialog(QDialog, Ui_Dialog):
 
@@ -141,9 +286,9 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.ICON_SIZES = {0:QSize(48, 48), 1:QSize(32,32), 2:QSize(24,24)}
         self.setupUi(self)
         self._category_model = CategoryModel()
-        
-        self.connect(self.category_view, SIGNAL('activated(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row()))
-        self.connect(self.category_view, SIGNAL('clicked(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row()))
+
+        self.category_view.currentChanged = \
+            lambda n, p: self.stackedWidget.setCurrentIndex(n.row())
         self.category_view.setModel(self._category_model)
         self.db = db
         self.server = server
@@ -151,7 +296,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.location.setText(path if path else '')
         self.connect(self.browse_button, SIGNAL('clicked(bool)'), self.browse)
         self.connect(self.compact_button, SIGNAL('clicked(bool)'), self.compact)
-        
+
         dirs = config['frequently_used_directories']
         rn = config['use_roman_numerals_for_series_number']
         self.timeout.setValue(prefs['network_timeout'])
@@ -162,20 +307,20 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.connect(self.remove_button, SIGNAL('clicked(bool)'), self.remove_dir)
         if not islinux:
             self.dirs_box.setVisible(False)
-        
+
         column_map = config['column_map']
         for col in column_map + [i for i in ALL_COLUMNS if i not in column_map]:
             item = QListWidgetItem(BooksModel.headers[col], self.columns)
             item.setData(Qt.UserRole, QVariant(col))
             item.setFlags(Qt.ItemIsEnabled|Qt.ItemIsUserCheckable|Qt.ItemIsSelectable)
             item.setCheckState(Qt.Checked if col in column_map else Qt.Unchecked)
-            
+
         self.connect(self.column_up, SIGNAL('clicked()'), self.up_column)
         self.connect(self.column_down, SIGNAL('clicked()'), self.down_column)
 
         self.filename_pattern = FilenamePattern(self)
         self.metadata_box.layout().insertWidget(0, self.filename_pattern)
-        
+
         icons = config['toolbar_icon_size']
         self.toolbar_button_size.setCurrentIndex(0 if icons == self.ICON_SIZES[0] else 1 if icons == self.ICON_SIZES[1] else 2)
         self.show_toolbar_text.setChecked(config['show_text_in_toolbar'])
@@ -183,7 +328,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.book_exts = sorted(BOOK_EXTENSIONS)
         for ext in self.book_exts:
             self.single_format.addItem(ext.upper(), QVariant(ext))
-        
+
         single_format = config['save_to_disk_single_format']
         self.single_format.setCurrentIndex(self.book_exts.index(single_format))
         self.cover_browse.setValue(config['cover_flow_queue_length'])
@@ -204,9 +349,9 @@ class ConfigDialog(QDialog, Ui_Dialog):
         items.sort(cmp=lambda x, y: cmp(x[1], y[1]))
         for item in items:
             self.language.addItem(item[1], QVariant(item[0]))
-            
+
         self.pdf_metadata.setChecked(prefs['read_file_metadata'])
-        
+
         added_html = False
         for ext in self.book_exts:
             ext = ext.lower()
@@ -242,7 +387,6 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.priority.setCurrentIndex(p)
         self.priority.setVisible(iswindows)
         self.priority_label.setVisible(iswindows)
-        self.category_view.setCurrentIndex(self._category_model.index(0))
         self._plugin_model = PluginModel()
         self.plugin_view.setModel(self._plugin_model)
         self.connect(self.toggle_plugin, SIGNAL('clicked()'), lambda : self.modify_plugin(op='toggle'))
@@ -251,7 +395,106 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.connect(self.button_plugin_browse, SIGNAL('clicked()'), self.find_plugin)
         self.connect(self.button_plugin_add, SIGNAL('clicked()'), self.add_plugin)
         self.separate_cover_flow.setChecked(config['separate_cover_flow'])
-    
+        self.setup_email_page()
+        self.category_view.setCurrentIndex(self.category_view.model().index(0))
+
+    def setup_email_page(self):
+        opts = smtp_prefs().parse()
+        if opts.from_:
+            self.email_from.setText(opts.from_)
+        self._email_accounts = EmailAccounts(opts.accounts)
+        self.email_view.setModel(self._email_accounts)
+        if opts.relay_host:
+            self.relay_host.setText(opts.relay_host)
+        self.relay_port.setValue(opts.relay_port)
+        if opts.relay_username:
+            self.relay_username.setText(opts.relay_username)
+        if opts.relay_password:
+            self.relay_password.setText(unhexlify(opts.relay_password))
+        (self.relay_tls if opts.encryption == 'TLS' else self.relay_ssl).setChecked(True)
+        self.connect(self.relay_use_gmail, SIGNAL('clicked(bool)'),
+                     self.create_gmail_relay)
+        self.connect(self.relay_show_password, SIGNAL('stateChanged(int)'),
+         lambda
+         state:self.relay_password.setEchoMode(self.relay_password.Password if
+             state == 0 else self.relay_password.Normal))
+        self.connect(self.email_add, SIGNAL('clicked(bool)'),
+                     self.add_email_account)
+        self.connect(self.email_make_default, SIGNAL('clicked(bool)'),
+             lambda c: self._email_accounts.make_default(self.email_view.currentIndex()))
+        self.email_view.resizeColumnsToContents()
+        self.connect(self.test_email_button, SIGNAL('clicked(bool)'),
+                self.test_email)
+
+    def add_email_account(self, checked):
+        index = self._email_accounts.add()
+        self.email_view.setCurrentIndex(index)
+        self.email_view.resizeColumnsToContents()
+        self.email_view.edit(index)
+
+    def create_gmail_relay(self, *args):
+        self.relay_username.setText('@gmail.com')
+        self.relay_password.setText('')
+        self.relay_host.setText('smtp.gmail.com')
+        self.relay_port.setValue(587)
+        self.relay_tls.setChecked(True)
+
+        info_dialog(self, _('Finish gmail setup'),
+            _('Dont forget to enter your gmail username and password')).exec_()
+        self.relay_username.setFocus(Qt.OtherFocusReason)
+        self.relay_username.setCursorPosition(0)
+
+    def set_email_settings(self):
+        from_ = unicode(self.email_from.text()).strip()
+        if self._email_accounts.accounts and not from_:
+            error_dialog(self, _('Bad configuration'),
+                         _('You must set the From email address')).exec_()
+            return False
+        username = unicode(self.relay_username.text()).strip()
+        password = unicode(self.relay_password.text()).strip()
+        host = unicode(self.relay_host.text()).strip()
+        if host and not (username and password):
+            error_dialog(self, _('Bad configuration'),
+                         _('You must set the username and password for '
+                           'the mail server.')).exec_()
+            return False
+        conf = smtp_prefs()
+        conf.set('from_', from_)
+        conf.set('accounts', self._email_accounts.accounts)
+        conf.set('relay_host', host if host else None)
+        conf.set('relay_port', self.relay_port.value())
+        conf.set('relay_username', username if username else None)
+        conf.set('relay_password', hexlify(password))
+        conf.set('encryption', 'TLS' if self.relay_tls.isChecked() else 'SSL')
+        return True
+
+    def test_email(self, *args):
+        if self.set_email_settings():
+          TestEmail(self._email_accounts.accounts, self).exec_()
+
+    def test_email_settings(self, to):
+        opts = smtp_prefs().parse()
+        from calibre.utils.smtp import sendmail, create_mail
+        buf = cStringIO.StringIO()
+        oout, oerr = sys.stdout, sys.stderr
+        sys.stdout = sys.stderr = buf
+        tb = None
+        try:
+            msg = create_mail(opts.from_, to, 'Test mail from calibre',
+                    'Test mail from calibre')
+            sendmail(msg, from_=opts.from_, to=[to],
+                verbose=3, timeout=30, relay=opts.relay_host,
+                username=opts.relay_username,
+                password=unhexlify(opts.relay_password),
+                encryption=opts.encryption, port=opts.relay_port)
+        except:
+            import traceback
+            tb = traceback.format_exc()
+            tb += '\n\nLog:\n' + buf.getvalue()
+        finally:
+            sys.stdout, sys.stderr = oout, oerr
+        return tb
+
     def add_plugin(self):
         path = unicode(self.plugin_path.text())
         if path and os.access(path, os.R_OK) and path.lower().endswith('.zip'):
@@ -259,22 +502,22 @@ class ConfigDialog(QDialog, Ui_Dialog):
             self._plugin_model.populate()
             self._plugin_model.reset()
         else:
-            error_dialog(self, _('No valid plugin path'), 
+            error_dialog(self, _('No valid plugin path'),
                          _('%s is not a valid plugin path')%path).exec_()
-    
+
     def find_plugin(self):
         path = choose_files(self, 'choose plugin dialog', _('Choose plugin'),
-                            filters=[('Plugins', ['zip'])], all_files=False, 
+                            filters=[('Plugins', ['zip'])], all_files=False,
                             select_only_single_file=True)
         if path:
             self.plugin_path.setText(path[0])
-    
+
     def modify_plugin(self, op=''):
         index = self.plugin_view.currentIndex()
         if index.isValid():
             plugin = self._plugin_model.index_to_plugin(index)
             if not plugin.can_be_disabled:
-                error_dialog(self,_('Plugin cannot be disabled'), 
+                error_dialog(self,_('Plugin cannot be disabled'),
                              _('The plugin: %s cannot be disabled')%plugin.name).exec_()
                 return
             if op == 'toggle':
@@ -286,7 +529,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
             if op == 'customize':
                 if not plugin.is_customizable():
                     info_dialog(self, _('Plugin not customizable'),
-                                _('Plugin: %s does not need customization')%plugin.name).exec_()
+                        _('Plugin: %s does not need customization')%plugin.name).exec_()
                     return
                 help = plugin.customization_help()
                 text, ok = QInputDialog.getText(self, _('Customize %s')%plugin.name,
@@ -299,22 +542,23 @@ class ConfigDialog(QDialog, Ui_Dialog):
                     self._plugin_model.populate()
                     self._plugin_model.reset()
                 else:
-                    error_dialog(self, _('Cannot remove builtin plugin'), 
-                                 plugin.name + _(' cannot be removed. It is a builtin plugin. Try disabling it instead.')).exec_()
-            
-    
+                    error_dialog(self, _('Cannot remove builtin plugin'),
+                         plugin.name + _(' cannot be removed. It is a '
+                         'builtin plugin. Try disabling it instead.')).exec_()
+
+
     def up_column(self):
         idx = self.columns.currentRow()
         if idx > 0:
             self.columns.insertItem(idx-1, self.columns.takeItem(idx))
             self.columns.setCurrentRow(idx-1)
-            
+
     def down_column(self):
         idx = self.columns.currentRow()
         if idx < self.columns.count()-1:
             self.columns.insertItem(idx+1, self.columns.takeItem(idx))
             self.columns.setCurrentRow(idx+1)
-    
+
     def view_server_logs(self):
         from calibre.library.server import log_access_file, log_error_file
         d = QDialog(self)
@@ -336,7 +580,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
         except IOError:
             el.setPlainText('No access log found')
         d.show()
-    
+
     def set_server_options(self):
         c = server_config()
         c.set('port', self.port.value())
@@ -345,7 +589,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
         if not p:
             p = None
         c.set('password', p)
-            
+
     def start_server(self):
         self.set_server_options()
         from calibre.library.server import start_threaded_server
@@ -353,13 +597,13 @@ class ConfigDialog(QDialog, Ui_Dialog):
         while not self.server.is_running and self.server.exception is None:
             time.sleep(1)
         if self.server.exception is not None:
-            error_dialog(self, _('Failed to start content server'), 
+            error_dialog(self, _('Failed to start content server'),
                          unicode(self.server.exception)).exec_()
             return
         self.start.setEnabled(False)
         self.test.setEnabled(True)
         self.stop.setEnabled(True)
-        
+
     def stop_server(self):
         from calibre.library.server import stop_threaded_server
         stop_threaded_server(self.server)
@@ -367,16 +611,17 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.start.setEnabled(True)
         self.test.setEnabled(False)
         self.stop.setEnabled(False)
-        
+
     def test_server(self):
         QDesktopServices.openUrl(QUrl('http://127.0.0.1:'+str(self.port.value())))
-        
+
     def compact(self, toggled):
         d = Vacuum(self, self.db)
         d.exec_()
 
     def browse(self):
-        dir = choose_dir(self, 'database location dialog', 'Select database location')
+        dir = choose_dir(self, 'database location dialog',
+                         _('Select database location'))
         if dir:
             self.location.setText(dir)
 
@@ -393,7 +638,10 @@ class ConfigDialog(QDialog, Ui_Dialog):
     def accept(self):
         mcs = unicode(self.max_cover_size.text()).strip()
         if not re.match(r'\d+x\d+', mcs):
-            error_dialog(self, _('Invalid size'), _('The size %s is invalid. must be of the form widthxheight')%mcs).exec_()
+            error_dialog(self, _('Invalid size'),
+             _('The size %s is invalid. must be of the form widthxheight')%mcs).exec_()
+            return
+        if not self.set_email_settings():
             return
         config['use_roman_numerals_for_series_number'] = bool(self.roman_numerals.isChecked())
         config['new_version_notification'] = bool(self.new_version_notification.isChecked())
@@ -429,18 +677,21 @@ class ConfigDialog(QDialog, Ui_Dialog):
             if self.viewer.item(i).checkState() == Qt.Checked:
                 fmts.append(str(self.viewer.item(i).text()))
         config['internally_viewed_formats'] = fmts
-        
+
         if not path or not os.path.exists(path) or not os.path.isdir(path):
             d = error_dialog(self, _('Invalid database location'),
-                             _('Invalid database location ')+path+_('<br>Must be a directory.'))
+                             _('Invalid database location ')+path+
+                             _('<br>Must be a directory.'))
             d.exec_()
         elif not os.access(path, os.W_OK):
             d = error_dialog(self, _('Invalid database location'),
-                             _('Invalid database location.<br>Cannot write to ')+path)
+                     _('Invalid database location.<br>Cannot write to ')+path)
             d.exec_()
         else:
             self.database_location = os.path.abspath(path)
-            self.directories = [qstring_to_unicode(self.directory_list.item(i).text()) for i in range(self.directory_list.count())]
+            self.directories = [
+              qstring_to_unicode(self.directory_list.item(i).text()) for i in \
+                    range(self.directory_list.count())]
             config['frequently_used_directories'] =  self.directories
             QDialog.accept(self)
 
@@ -448,7 +699,8 @@ class Vacuum(QMessageBox):
 
     def __init__(self, parent, db):
         self.db = db
-        QMessageBox.__init__(self, QMessageBox.Information, _('Compacting...'), _('Compacting database. This may take a while.'),
+        QMessageBox.__init__(self, QMessageBox.Information, _('Compacting...'),
+                             _('Compacting database. This may take a while.'),
                              QMessageBox.NoButton, parent)
         QTimer.singleShot(200, self.vacuum)
 
@@ -456,3 +708,11 @@ class Vacuum(QMessageBox):
         self.db.vacuum()
         self.accept()
 
+if __name__ == '__main__':
+    from calibre.library.database2 import LibraryDatabase2
+    from PyQt4.Qt import QApplication
+    app = QApplication([])
+    d=ConfigDialog(None, LibraryDatabase2('/tmp'))
+    d.category_view.setCurrentIndex(d.category_view.model().index(2))
+    d.show()
+    app.exec_()
diff --git a/src/calibre/gui2/dialogs/config.ui b/src/calibre/gui2/dialogs/config.ui
index 9f734f9a68..a75a6f0a8d 100644
--- a/src/calibre/gui2/dialogs/config.ui
+++ b/src/calibre/gui2/dialogs/config.ui
@@ -1,117 +1,118 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <author>Kovid Goyal</author>
  <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>755</width>
+    <width>800</width>
     <height>557</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Configuration</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../images.qrc" >
+  <property name="windowIcon">
+   <iconset resource="../images.qrc">
     <normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <layout class="QHBoxLayout" >
+  <layout class="QGridLayout">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QListView" name="category_view" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
+      <widget class="QListView" name="category_view">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
          <horstretch>1</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="font" >
+       <property name="font">
         <font>
          <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
-       <property name="tabKeyNavigation" >
+       <property name="tabKeyNavigation">
         <bool>true</bool>
        </property>
-       <property name="showDropIndicator" stdset="0" >
+       <property name="showDropIndicator" stdset="0">
         <bool>false</bool>
        </property>
-       <property name="iconSize" >
+       <property name="iconSize">
         <size>
          <width>48</width>
          <height>48</height>
         </size>
        </property>
-       <property name="verticalScrollMode" >
+       <property name="verticalScrollMode">
         <enum>QAbstractItemView::ScrollPerItem</enum>
        </property>
-       <property name="horizontalScrollMode" >
+       <property name="horizontalScrollMode">
         <enum>QAbstractItemView::ScrollPerPixel</enum>
        </property>
-       <property name="flow" >
+       <property name="flow">
         <enum>QListView::TopToBottom</enum>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>20</number>
        </property>
-       <property name="viewMode" >
+       <property name="viewMode">
         <enum>QListView::ListMode</enum>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QStackedWidget" name="stackedWidget" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+      <widget class="QStackedWidget" name="stackedWidget">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>100</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="currentIndex" >
+       <property name="currentIndex">
         <number>0</number>
        </property>
-       <widget class="QWidget" name="page_3" >
-        <layout class="QVBoxLayout" name="verticalLayout" >
+       <widget class="QWidget" name="page_3">
+        <layout class="QVBoxLayout" name="verticalLayout">
          <item>
-          <layout class="QVBoxLayout" name="_2" >
+          <layout class="QVBoxLayout" name="_2">
            <item>
-            <widget class="QLabel" name="label" >
-             <property name="maximumSize" >
+            <widget class="QLabel" name="label">
+             <property name="maximumSize">
               <size>
                <width>16777215</width>
                <height>70</height>
               </size>
              </property>
-             <property name="text" >
+             <property name="text">
               <string>&amp;Location of ebooks (The ebooks are stored in folders sorted by author and metadata is stored in the file metadata.db)</string>
              </property>
-             <property name="wordWrap" >
+             <property name="wordWrap">
               <bool>true</bool>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>location</cstring>
              </property>
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="_3" >
+            <layout class="QHBoxLayout" name="_3">
              <item>
-              <widget class="QLineEdit" name="location" />
+              <widget class="QLineEdit" name="location"/>
              </item>
              <item>
-              <widget class="QToolButton" name="browse_button" >
-               <property name="toolTip" >
+              <widget class="QToolButton" name="browse_button">
+               <property name="toolTip">
                 <string>Browse for the new database location</string>
                </property>
-               <property name="text" >
+               <property name="text">
                 <string>...</string>
                </property>
-               <property name="icon" >
-                <iconset resource="../images.qrc" >
+               <property name="icon">
+                <iconset resource="../images.qrc">
                  <normaloff>:/images/mimetypes/dir.svg</normaloff>:/images/mimetypes/dir.svg</iconset>
                </property>
               </widget>
@@ -121,107 +122,107 @@
           </layout>
          </item>
          <item>
-          <widget class="QCheckBox" name="new_version_notification" >
-           <property name="text" >
+          <widget class="QCheckBox" name="new_version_notification">
+           <property name="text">
             <string>Show notification when &amp;new version is available</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="pdf_metadata" >
-           <property name="toolTip" >
+          <widget class="QCheckBox" name="pdf_metadata">
+           <property name="toolTip">
             <string>If you disable this setting, metadata is guessed from the filename instead. This can be configured in the Advanced section.</string>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>Read &amp;metadata from files</string>
            </property>
-           <property name="checked" >
+           <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QGridLayout" name="gridLayout_2" >
-           <item row="0" column="0" >
-            <widget class="QLabel" name="label_5" >
-             <property name="text" >
+          <layout class="QGridLayout" name="gridLayout_2">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_5">
+             <property name="text">
               <string>Format for &amp;single file save:</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>single_format</cstring>
              </property>
             </widget>
            </item>
-           <item row="0" column="1" >
-            <widget class="QComboBox" name="single_format" />
+           <item row="0" column="1">
+            <widget class="QComboBox" name="single_format"/>
            </item>
-           <item row="1" column="0" >
-            <widget class="QLabel" name="label_2" >
-             <property name="text" >
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_2">
+             <property name="text">
               <string>Default network &amp;timeout:</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>timeout</cstring>
              </property>
             </widget>
            </item>
-           <item row="1" column="1" >
-            <widget class="QSpinBox" name="timeout" >
-             <property name="toolTip" >
+           <item row="1" column="1">
+            <widget class="QSpinBox" name="timeout">
+             <property name="toolTip">
               <string>Set the default timeout for network fetches (i.e. anytime we go out to the internet to get information)</string>
              </property>
-             <property name="suffix" >
+             <property name="suffix">
               <string> seconds</string>
              </property>
-             <property name="minimum" >
+             <property name="minimum">
               <number>2</number>
              </property>
-             <property name="maximum" >
+             <property name="maximum">
               <number>120</number>
              </property>
-             <property name="value" >
+             <property name="value">
               <number>5</number>
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
-            <widget class="QComboBox" name="language" />
+           <item row="2" column="1">
+            <widget class="QComboBox" name="language"/>
            </item>
-           <item row="2" column="0" >
-            <widget class="QLabel" name="label_7" >
-             <property name="text" >
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_7">
+             <property name="text">
               <string>Choose &amp;language (requires restart):</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>language</cstring>
              </property>
             </widget>
            </item>
-           <item row="3" column="1" >
-            <widget class="QComboBox" name="priority" >
+           <item row="3" column="1">
+            <widget class="QComboBox" name="priority">
              <item>
-              <property name="text" >
+              <property name="text">
                <string>Normal</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>High</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>Low</string>
               </property>
              </item>
             </widget>
            </item>
-           <item row="3" column="0" >
-            <widget class="QLabel" name="priority_label" >
-             <property name="text" >
+           <item row="3" column="0">
+            <widget class="QLabel" name="priority_label">
+             <property name="text">
               <string>Job &amp;priority:</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>priority</cstring>
              </property>
             </widget>
@@ -229,19 +230,19 @@
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="dirs_box" >
-           <property name="title" >
+          <widget class="QGroupBox" name="dirs_box">
+           <property name="title">
             <string>Frequently used directories</string>
            </property>
-           <layout class="QGridLayout" name="_5" >
-            <item row="0" column="0" >
-             <layout class="QHBoxLayout" name="_6" >
+           <layout class="QGridLayout" name="_5">
+            <item row="0" column="0">
+             <layout class="QHBoxLayout" name="_6">
               <item>
-               <widget class="QListWidget" name="directory_list" >
-                <property name="alternatingRowColors" >
+               <widget class="QListWidget" name="directory_list">
+                <property name="alternatingRowColors">
                  <bool>true</bool>
                 </property>
-                <property name="iconSize" >
+                <property name="iconSize">
                  <size>
                   <width>22</width>
                   <height>22</height>
@@ -250,13 +251,13 @@
                </widget>
               </item>
               <item>
-               <layout class="QVBoxLayout" name="_7" >
+               <layout class="QVBoxLayout" name="_7">
                 <item>
                  <spacer>
-                  <property name="orientation" >
+                  <property name="orientation">
                    <enum>Qt::Vertical</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" stdset="0">
                    <size>
                     <width>20</width>
                     <height>40</height>
@@ -265,25 +266,25 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QToolButton" name="add_button" >
-                  <property name="toolTip" >
+                 <widget class="QToolButton" name="add_button">
+                  <property name="toolTip">
                    <string>Add a directory to the frequently used directories list</string>
                   </property>
-                  <property name="text" >
+                  <property name="text">
                    <string>...</string>
                   </property>
-                  <property name="icon" >
-                   <iconset resource="../images.qrc" >
+                  <property name="icon">
+                   <iconset resource="../images.qrc">
                     <normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
                   </property>
                  </widget>
                 </item>
                 <item>
                  <spacer>
-                  <property name="orientation" >
+                  <property name="orientation">
                    <enum>Qt::Vertical</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" stdset="0">
                    <size>
                     <width>20</width>
                     <height>40</height>
@@ -292,25 +293,25 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QToolButton" name="remove_button" >
-                  <property name="toolTip" >
+                 <widget class="QToolButton" name="remove_button">
+                  <property name="toolTip">
                    <string>Remove a directory from the frequently used directories list</string>
                   </property>
-                  <property name="text" >
+                  <property name="text">
                    <string>...</string>
                   </property>
-                  <property name="icon" >
-                   <iconset resource="../images.qrc" >
+                  <property name="icon">
+                   <iconset resource="../images.qrc">
                     <normaloff>:/images/list_remove.svg</normaloff>:/images/list_remove.svg</iconset>
                   </property>
                  </widget>
                 </item>
                 <item>
                  <spacer>
-                  <property name="orientation" >
+                  <property name="orientation">
                    <enum>Qt::Vertical</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" stdset="0">
                    <size>
                     <width>20</width>
                     <height>40</height>
@@ -327,163 +328,157 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page" >
-        <layout class="QVBoxLayout" name="verticalLayout_4" >
+       <widget class="QWidget" name="page">
+        <layout class="QVBoxLayout" name="verticalLayout_4">
          <item>
-          <widget class="QCheckBox" name="roman_numerals" >
-           <property name="text" >
+          <widget class="QCheckBox" name="roman_numerals">
+           <property name="text">
             <string>Use &amp;Roman numerals for series number</string>
            </property>
-           <property name="checked" >
+           <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="systray_icon" >
-           <property name="text" >
+          <widget class="QCheckBox" name="systray_icon">
+           <property name="text">
             <string>Enable system &amp;tray icon (needs restart)</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="systray_notifications" >
-           <property name="text" >
+          <widget class="QCheckBox" name="systray_notifications">
+           <property name="text">
             <string>Show &amp;notifications in system tray</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="separate_cover_flow" >
-           <property name="text" >
+          <widget class="QCheckBox" name="separate_cover_flow">
+           <property name="text">
             <string>Show cover &amp;browser in a separate window (needs restart)</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="sync_news" >
-           <property name="text" >
+          <widget class="QCheckBox" name="sync_news">
+           <property name="text">
             <string>Automatically send downloaded &amp;news to ebook reader</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="delete_news" >
-           <property name="text" >
+          <widget class="QCheckBox" name="delete_news">
+           <property name="text">
             <string>&amp;Delete news from library when it is sent to reader</string>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout" >
+          <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
-            <widget class="QLabel" name="label_6" >
-             <property name="text" >
+            <widget class="QLabel" name="label_6">
+             <property name="text">
               <string>&amp;Number of covers to show in browse mode (needs restart):</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>cover_browse</cstring>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QSpinBox" name="cover_browse" />
+            <widget class="QSpinBox" name="cover_browse"/>
            </item>
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="groupBox_2" >
-           <property name="title" >
+          <widget class="QGroupBox" name="groupBox_2">
+           <property name="title">
             <string>Toolbar</string>
            </property>
-           <layout class="QGridLayout" name="gridLayout" >
-            <item row="0" column="1" >
-             <widget class="QComboBox" name="toolbar_button_size" >
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="1">
+             <widget class="QComboBox" name="toolbar_button_size">
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>Large</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>Medium</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>Small</string>
                </property>
               </item>
              </widget>
             </item>
-            <item row="0" column="0" >
-             <widget class="QLabel" name="label_4" >
-              <property name="text" >
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_4">
+              <property name="text">
                <string>&amp;Button size in toolbar</string>
               </property>
-              <property name="buddy" >
+              <property name="buddy">
                <cstring>toolbar_button_size</cstring>
               </property>
              </widget>
             </item>
-            <item row="1" column="0" >
-             <widget class="QCheckBox" name="show_toolbar_text" >
-              <property name="text" >
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="show_toolbar_text">
+              <property name="text">
                <string>Show &amp;text in toolbar buttons</string>
               </property>
-              <property name="checked" >
+              <property name="checked">
                <bool>true</bool>
               </property>
              </widget>
             </item>
            </layout>
-           <zorder>toolbar_button_size</zorder>
-           <zorder>label_4</zorder>
-           <zorder>show_toolbar_text</zorder>
-           <zorder>columns</zorder>
-           <zorder></zorder>
-           <zorder>groupBox_3</zorder>
           </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_7" >
+          <layout class="QHBoxLayout" name="horizontalLayout_7">
            <item>
-            <widget class="QGroupBox" name="groupBox" >
-             <property name="title" >
+            <widget class="QGroupBox" name="groupBox">
+             <property name="title">
               <string>Select visible &amp;columns in library view</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_7" >
+             <layout class="QVBoxLayout" name="verticalLayout_7">
               <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_3" >
+               <layout class="QHBoxLayout" name="horizontalLayout_3">
                 <item>
-                 <widget class="QListWidget" name="columns" >
-                  <property name="alternatingRowColors" >
+                 <widget class="QListWidget" name="columns">
+                  <property name="alternatingRowColors">
                    <bool>true</bool>
                   </property>
-                  <property name="selectionBehavior" >
+                  <property name="selectionBehavior">
                    <enum>QAbstractItemView::SelectRows</enum>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_3" >
+                 <layout class="QVBoxLayout" name="verticalLayout_3">
                   <item>
-                   <widget class="QToolButton" name="column_up" >
-                    <property name="text" >
+                   <widget class="QToolButton" name="column_up">
+                    <property name="text">
                      <string>...</string>
                     </property>
-                    <property name="icon" >
-                     <iconset resource="../images.qrc" >
+                    <property name="icon">
+                     <iconset resource="../images.qrc">
                       <normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <spacer name="verticalSpacer_2" >
-                    <property name="orientation" >
+                   <spacer name="verticalSpacer_2">
+                    <property name="orientation">
                      <enum>Qt::Vertical</enum>
                     </property>
-                    <property name="sizeHint" stdset="0" >
+                    <property name="sizeHint" stdset="0">
                      <size>
                       <width>20</width>
                       <height>40</height>
@@ -492,12 +487,12 @@
                    </spacer>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="column_down" >
-                    <property name="text" >
+                   <widget class="QToolButton" name="column_down">
+                    <property name="text">
                      <string>...</string>
                     </property>
-                    <property name="icon" >
-                     <iconset resource="../images.qrc" >
+                    <property name="icon">
+                     <iconset resource="../images.qrc">
                       <normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
                     </property>
                    </widget>
@@ -507,21 +502,20 @@
                </layout>
               </item>
              </layout>
-             <zorder>columns</zorder>
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="groupBox_3" >
-             <property name="title" >
+            <widget class="QGroupBox" name="groupBox_3">
+             <property name="title">
               <string>Use internal &amp;viewer for:</string>
              </property>
-             <layout class="QGridLayout" name="gridLayout_4" >
-              <item row="0" column="0" >
-               <widget class="QListWidget" name="viewer" >
-                <property name="alternatingRowColors" >
+             <layout class="QGridLayout" name="gridLayout_4">
+              <item row="0" column="0">
+               <widget class="QListWidget" name="viewer">
+                <property name="alternatingRowColors">
                  <bool>true</bool>
                 </property>
-                <property name="selectionMode" >
+                <property name="selectionMode">
                  <enum>QAbstractItemView::NoSelection</enum>
                 </property>
                </widget>
@@ -534,26 +528,317 @@
         </layout>
         <zorder>roman_numerals</zorder>
         <zorder>groupBox_2</zorder>
-        <zorder>groupBox</zorder>
         <zorder>systray_icon</zorder>
         <zorder>sync_news</zorder>
         <zorder>delete_news</zorder>
         <zorder>separate_cover_flow</zorder>
         <zorder>systray_notifications</zorder>
-        <zorder>groupBox_3</zorder>
         <zorder></zorder>
         <zorder></zorder>
        </widget>
-       <widget class="QWidget" name="page_2" >
-        <layout class="QVBoxLayout" >
+       <widget class="QWidget" name="page_6">
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="0" column="0" colspan="2">
+          <widget class="QLabel" name="label_22">
+           <property name="text">
+            <string>calibre can send your books to you (or your reader) by email</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" colspan="2">
+          <layout class="QHBoxLayout" name="horizontalLayout_9">
+           <item>
+            <widget class="QLabel" name="label_15">
+             <property name="text">
+              <string>Send email &amp;from:</string>
+             </property>
+             <property name="buddy">
+              <cstring>email_from</cstring>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="email_from">
+             <property name="toolTip">
+              <string>&lt;p&gt;This is what will be present in the From: field of emails sent by calibre.&lt;br&gt; Set it to your email address</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="0" colspan="2">
+          <layout class="QHBoxLayout" name="horizontalLayout_8">
+           <item>
+            <widget class="QTableView" name="email_view">
+             <property name="selectionMode">
+              <enum>QAbstractItemView::SingleSelection</enum>
+             </property>
+             <property name="selectionBehavior">
+              <enum>QAbstractItemView::SelectRows</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_8">
+             <item>
+              <widget class="QToolButton" name="email_add">
+               <property name="toolTip">
+                <string>Add an email address to which to send books</string>
+               </property>
+               <property name="text">
+                <string>&amp;Add email</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../images.qrc">
+                 <normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+               <property name="toolButtonStyle">
+                <enum>Qt::ToolButtonTextUnderIcon</enum>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="email_make_default">
+               <property name="text">
+                <string>Make &amp;default</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="email_remove">
+               <property name="text">
+                <string>&amp;Remove email</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../images.qrc">
+                 <normaloff>:/images/minus.svg</normaloff>:/images/minus.svg</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+               <property name="toolButtonStyle">
+                <enum>Qt::ToolButtonTextUnderIcon</enum>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </item>
+         <item row="3" column="0">
+          <widget class="QGroupBox" name="groupBox_5">
+           <property name="toolTip">
+            <string>&lt;p&gt;A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
+           </property>
+           <property name="title">
+            <string>Mail &amp;Server</string>
+           </property>
+           <layout class="QGridLayout" name="gridLayout_3">
+            <item row="0" column="0" colspan="4">
+             <widget class="QLabel" name="label_16">
+              <property name="text">
+               <string>calibre can &lt;b&gt;optionally&lt;/b&gt; use a server to send mail</string>
+              </property>
+              <property name="wordWrap">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_17">
+              <property name="text">
+               <string>&amp;Hostname:</string>
+              </property>
+              <property name="buddy">
+               <cstring>relay_host</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1" colspan="2">
+             <widget class="QLineEdit" name="relay_host">
+              <property name="toolTip">
+               <string>The hostname of your mail server. For e.g. smtp.gmail.com</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="3">
+             <layout class="QHBoxLayout" name="horizontalLayout_11">
+              <item>
+               <widget class="QLabel" name="label_18">
+                <property name="text">
+                 <string>&amp;Port:</string>
+                </property>
+                <property name="buddy">
+                 <cstring>relay_port</cstring>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QSpinBox" name="relay_port">
+                <property name="toolTip">
+                 <string>The port your mail server listens for connections on. The default is 25</string>
+                </property>
+                <property name="minimum">
+                 <number>1</number>
+                </property>
+                <property name="maximum">
+                 <number>65555</number>
+                </property>
+                <property name="value">
+                 <number>25</number>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_19">
+              <property name="text">
+               <string>&amp;Username:</string>
+              </property>
+              <property name="buddy">
+               <cstring>relay_username</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1" colspan="2">
+             <widget class="QLineEdit" name="relay_username">
+              <property name="toolTip">
+               <string>Your username on the mail server</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_20">
+              <property name="text">
+               <string>&amp;Password:</string>
+              </property>
+              <property name="buddy">
+               <cstring>relay_password</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1" colspan="2">
+             <widget class="QLineEdit" name="relay_password">
+              <property name="toolTip">
+               <string>Your password on the mail server</string>
+              </property>
+              <property name="echoMode">
+               <enum>QLineEdit::Password</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="3">
+             <widget class="QCheckBox" name="relay_show_password">
+              <property name="text">
+               <string>&amp;Show</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label_21">
+              <property name="text">
+               <string>&amp;Encryption:</string>
+              </property>
+              <property name="buddy">
+               <cstring>relay_tls</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QRadioButton" name="relay_tls">
+              <property name="toolTip">
+               <string>Use TLS encryption when connecting to the mail server. This is the most common.</string>
+              </property>
+              <property name="text">
+               <string>&amp;TLS</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="2" colspan="2">
+             <widget class="QRadioButton" name="relay_ssl">
+              <property name="toolTip">
+               <string>Use SSL encryption when connecting to the mail server.</string>
+              </property>
+              <property name="text">
+               <string>&amp;SSL</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="4">
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <layout class="QVBoxLayout" name="verticalLayout_9">
+           <item>
+            <widget class="QToolButton" name="relay_use_gmail">
+             <property name="text">
+              <string>Use Gmail</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../images.qrc">
+               <normaloff>:/images/gmail_logo.png</normaloff>:/images/gmail_logo.png</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>48</width>
+               <height>48</height>
+              </size>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextUnderIcon</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="test_email_button">
+             <property name="text">
+              <string>&amp;Test email</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="page_2">
+        <layout class="QVBoxLayout">
          <item>
-          <layout class="QHBoxLayout" >
+          <layout class="QHBoxLayout">
            <item>
             <spacer>
-             <property name="orientation" >
+             <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0" >
+             <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
@@ -562,21 +847,21 @@
             </spacer>
            </item>
            <item>
-            <widget class="QToolButton" name="compact_button" >
-             <property name="toolTip" >
+            <widget class="QToolButton" name="compact_button">
+             <property name="toolTip">
               <string>Free unused diskspace from the database</string>
              </property>
-             <property name="text" >
+             <property name="text">
               <string>&amp;Compact database</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer>
-             <property name="orientation" >
+             <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0" >
+             <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
@@ -587,17 +872,17 @@
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="metadata_box" >
-           <property name="title" >
+          <widget class="QGroupBox" name="metadata_box">
+           <property name="title">
             <string>&amp;Metadata from file name</string>
            </property>
-           <layout class="QVBoxLayout" >
+           <layout class="QVBoxLayout">
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
                 <height>40</height>
@@ -610,96 +895,96 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page_4" >
-        <layout class="QVBoxLayout" name="verticalLayout_2" >
+       <widget class="QWidget" name="page_4">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
-          <widget class="QLabel" name="label_9" >
-           <property name="text" >
+          <widget class="QLabel" name="label_9">
+           <property name="text">
             <string>calibre contains a network server that allows you to access your book collection using a browser from anywhere in the world. Any changes to the settings will only take effect after a server restart.</string>
            </property>
-           <property name="wordWrap" >
+           <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QGridLayout" name="gridLayout_5" >
-           <item row="0" column="0" >
-            <widget class="QLabel" name="label_10" >
-             <property name="text" >
+          <layout class="QGridLayout" name="gridLayout_5">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_10">
+             <property name="text">
               <string>Server &amp;port:</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>port</cstring>
              </property>
             </widget>
            </item>
-           <item row="0" column="1" >
-            <widget class="QSpinBox" name="port" >
-             <property name="minimum" >
+           <item row="0" column="1">
+            <widget class="QSpinBox" name="port">
+             <property name="minimum">
               <number>1025</number>
              </property>
-             <property name="maximum" >
+             <property name="maximum">
               <number>16000</number>
              </property>
-             <property name="value" >
+             <property name="value">
               <number>8080</number>
              </property>
             </widget>
            </item>
-           <item row="1" column="0" >
-            <widget class="QLabel" name="label_11" >
-             <property name="text" >
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_11">
+             <property name="text">
               <string>&amp;Username:</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>username</cstring>
              </property>
             </widget>
            </item>
-           <item row="1" column="1" >
-            <widget class="QLineEdit" name="username" />
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="username"/>
            </item>
-           <item row="2" column="0" >
-            <widget class="QLabel" name="label_12" >
-             <property name="text" >
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_12">
+             <property name="text">
               <string>&amp;Password:</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>password</cstring>
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
-            <widget class="QLineEdit" name="password" >
-             <property name="toolTip" >
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="password">
+             <property name="toolTip">
               <string>If you leave the password blank, anyone will be able to access your book collection using the web interface.</string>
              </property>
             </widget>
            </item>
-           <item row="4" column="1" >
-            <widget class="QCheckBox" name="show_server_password" >
-             <property name="text" >
+           <item row="4" column="1">
+            <widget class="QCheckBox" name="show_server_password">
+             <property name="text">
               <string>&amp;Show password</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="1" >
-            <widget class="QLineEdit" name="max_cover_size" >
-             <property name="toolTip" >
+           <item row="3" column="1">
+            <widget class="QLineEdit" name="max_cover_size">
+             <property name="toolTip">
               <string>The maximum size (widthxheight) for displayed covers. Larger covers are resized. </string>
              </property>
-             <property name="text" >
+             <property name="text">
               <string/>
              </property>
             </widget>
            </item>
-           <item row="3" column="0" >
-            <widget class="QLabel" name="label_3" >
-             <property name="text" >
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_3">
+             <property name="text">
               <string>Max. &amp;cover size:</string>
              </property>
-             <property name="buddy" >
+             <property name="buddy">
               <cstring>max_cover_size</cstring>
              </property>
             </widget>
@@ -707,27 +992,27 @@
           </layout>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_2" >
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
-            <widget class="QPushButton" name="start" >
-             <property name="text" >
+            <widget class="QPushButton" name="start">
+             <property name="text">
               <string>&amp;Start Server</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="stop" >
-             <property name="text" >
+            <widget class="QPushButton" name="stop">
+             <property name="text">
               <string>St&amp;op Server</string>
              </property>
             </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer" >
-             <property name="orientation" >
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0" >
+             <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
@@ -736,8 +1021,8 @@
             </spacer>
            </item>
            <item>
-            <widget class="QPushButton" name="test" >
-             <property name="text" >
+            <widget class="QPushButton" name="test">
+             <property name="text">
               <string>&amp;Test Server</string>
              </property>
             </widget>
@@ -745,25 +1030,25 @@
           </layout>
          </item>
          <item>
-          <widget class="QCheckBox" name="auto_launch" >
-           <property name="text" >
+          <widget class="QCheckBox" name="auto_launch">
+           <property name="text">
             <string>Run server &amp;automatically on startup</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="view_logs" >
-           <property name="text" >
+          <widget class="QPushButton" name="view_logs">
+           <property name="text">
             <string>View &amp;server logs</string>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="verticalSpacer_3" >
-           <property name="orientation" >
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>40</height>
@@ -772,21 +1057,21 @@
           </spacer>
          </item>
          <item>
-          <widget class="QLabel" name="label_13" >
-           <property name="text" >
+          <widget class="QLabel" name="label_13">
+           <property name="text">
             <string>If you want to use the content server to access your ebook collection on your iphone with Stanza, you will need to add the URL http://myhostname:8080/stanza as a new catalog in the stanza reader on your iphone. Here myhostname should be the fully qualified hostname or the IP address of this computer.</string>
            </property>
-           <property name="wordWrap" >
+           <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="verticalSpacer" >
-           <property name="orientation" >
+          <spacer name="verticalSpacer">
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>40</height>
@@ -796,53 +1081,53 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page_5" >
-        <layout class="QVBoxLayout" name="verticalLayout_6" >
+       <widget class="QWidget" name="page_5">
+        <layout class="QVBoxLayout" name="verticalLayout_6">
          <item>
-          <widget class="QLabel" name="label_8" >
-           <property name="text" >
+          <widget class="QLabel" name="label_8">
+           <property name="text">
             <string>Here you can customize the behavior of Calibre by controlling what plugins it uses.</string>
            </property>
-           <property name="wordWrap" >
+           <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QTreeView" name="plugin_view" >
-           <property name="iconSize" >
+          <widget class="QTreeView" name="plugin_view">
+           <property name="iconSize">
             <size>
              <width>32</width>
              <height>32</height>
             </size>
            </property>
-           <property name="animated" >
+           <property name="animated">
             <bool>true</bool>
            </property>
-           <property name="headerHidden" >
+           <property name="headerHidden">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_6" >
+          <layout class="QHBoxLayout" name="horizontalLayout_6">
            <item>
-            <widget class="QPushButton" name="toggle_plugin" >
-             <property name="text" >
+            <widget class="QPushButton" name="toggle_plugin">
+             <property name="text">
               <string>Enable/&amp;Disable plugin</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="customize_plugin" >
-             <property name="text" >
+            <widget class="QPushButton" name="customize_plugin">
+             <property name="text">
               <string>&amp;Customize plugin</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="remove_plugin" >
-             <property name="text" >
+            <widget class="QPushButton" name="remove_plugin">
+             <property name="text">
               <string>&amp;Remove plugin</string>
              </property>
             </widget>
@@ -850,33 +1135,33 @@
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="groupBox_4" >
-           <property name="title" >
+          <widget class="QGroupBox" name="groupBox_4">
+           <property name="title">
             <string>Add new plugin</string>
            </property>
-           <layout class="QVBoxLayout" name="verticalLayout_5" >
+           <layout class="QVBoxLayout" name="verticalLayout_5">
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_5" >
+             <layout class="QHBoxLayout" name="horizontalLayout_5">
               <item>
-               <widget class="QLabel" name="label_14" >
-                <property name="text" >
+               <widget class="QLabel" name="label_14">
+                <property name="text">
                  <string>Plugin &amp;file:</string>
                 </property>
-                <property name="buddy" >
+                <property name="buddy">
                  <cstring>plugin_path</cstring>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QLineEdit" name="plugin_path" />
+               <widget class="QLineEdit" name="plugin_path"/>
               </item>
               <item>
-               <widget class="QToolButton" name="button_plugin_browse" >
-                <property name="text" >
+               <widget class="QToolButton" name="button_plugin_browse">
+                <property name="text">
                  <string>...</string>
                 </property>
-                <property name="icon" >
-                 <iconset resource="../images.qrc" >
+                <property name="icon">
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
                 </property>
                </widget>
@@ -884,13 +1169,13 @@
              </layout>
             </item>
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_4" >
+             <layout class="QHBoxLayout" name="horizontalLayout_4">
               <item>
-               <spacer name="horizontalSpacer_2" >
-                <property name="orientation" >
+               <spacer name="horizontalSpacer_2">
+                <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="sizeHint" stdset="0" >
+                <property name="sizeHint" stdset="0">
                  <size>
                   <width>40</width>
                   <height>20</height>
@@ -899,8 +1184,8 @@
                </spacer>
               </item>
               <item>
-               <widget class="QPushButton" name="button_plugin_add" >
-                <property name="text" >
+               <widget class="QPushButton" name="button_plugin_add">
+                <property name="text">
                  <string>&amp;Add</string>
                 </property>
                </widget>
@@ -916,12 +1201,12 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -929,7 +1214,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../images.qrc" />
+  <include location="../images.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -938,11 +1223,11 @@
    <receiver>Dialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>239</x>
      <y>558</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -954,11 +1239,11 @@
    <receiver>Dialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>307</x>
      <y>558</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
diff --git a/src/calibre/gui2/dialogs/epub.py b/src/calibre/gui2/dialogs/epub.py
index 88607b1f8d..0773440b01 100644
--- a/src/calibre/gui2/dialogs/epub.py
+++ b/src/calibre/gui2/dialogs/epub.py
@@ -6,14 +6,14 @@ __docformat__ = 'restructuredtext en'
 '''
 The GUI for conversion to EPUB.
 '''
-import os
+import os, uuid
 
 from PyQt4.Qt import QDialog, QSpinBox, QDoubleSpinBox, QComboBox, QLineEdit, \
                      QTextEdit, QCheckBox, Qt, QPixmap, QIcon, QListWidgetItem, SIGNAL
 from lxml.etree import XPath
 
 from calibre.gui2.dialogs.choose_format import ChooseFormatDialog
-from calibre.gui2.dialogs.epub_ui import Ui_Dialog 
+from calibre.gui2.dialogs.epub_ui import Ui_Dialog
 from calibre.gui2 import error_dialog, choose_images, pixmap_to_data, ResizableDialog
 from calibre.ebooks.epub.from_any import SOURCE_FORMATS, config as epubconfig
 from calibre.ebooks.metadata import MetaInformation
@@ -23,16 +23,16 @@ from calibre.ebooks.metadata import authors_to_string, string_to_authors
 
 
 class Config(ResizableDialog, Ui_Dialog):
-    
+
     OUTPUT = 'EPUB'
-        
+
     def __init__(self, parent, db, row=None, config=epubconfig):
         ResizableDialog.__init__(self, parent)
         self.hide_controls()
         self.connect(self.category_list, SIGNAL('itemEntered(QListWidgetItem *)'),
                         self.show_category_help)
         self.connect(self.cover_button, SIGNAL("clicked()"), self.select_cover)
-        
+
         self.cover_changed = False
         self.db = db
         self.id = None
@@ -52,7 +52,7 @@ class Config(ResizableDialog, Ui_Dialog):
             self.setWindowTitle(_('Bulk convert to ')+self.OUTPUT)
         else:
             self.setWindowTitle((_(u'Convert %s to ')%unicode(self.title.text()))+self.OUTPUT)
-    
+
     def hide_controls(self):
         self.source_profile_label.setVisible(False)
         self.opt_source_profile.setVisible(False)
@@ -63,7 +63,7 @@ class Config(ResizableDialog, Ui_Dialog):
         self.opt_rescale_images.setVisible(False)
         self.opt_ignore_tables.setVisible(False)
         self.opt_prefer_author_sort.setVisible(False)
-        
+
     def initialize(self):
         self.__w = []
         self.__w.append(QIcon(':/images/dialog_information.svg'))
@@ -76,11 +76,11 @@ class Config(ResizableDialog, Ui_Dialog):
         self.item4 = QListWidgetItem(self.__w[-1], _('Chapter Detection').replace(' ','\n'), self.category_list)
         self.setup_tooltips()
         self.initialize_options()
-    
+
     def set_help(self, msg):
         if msg and getattr(msg, 'strip', lambda:True)():
             self.help_view.setPlainText(msg)
-        
+
     def setup_tooltips(self):
         for opt in self.config.option_set.preferences:
             g = getattr(self, 'opt_'+opt.name, False)
@@ -90,19 +90,19 @@ class Config(ResizableDialog, Ui_Dialog):
                 g.setToolTip(help.replace('<', '&lt;').replace('>', '&gt;'))
                 g.setWhatsThis(help.replace('<', '&lt;').replace('>', '&gt;'))
                 g.__class__.enterEvent = lambda obj, event: self.set_help(getattr(obj, '_help', obj.toolTip()))
-    
+
     def show_category_help(self, item):
         text = unicode(item.text())
         help = {
                 _('Metadata')          : _('Specify metadata such as title and author for the book.\n\nMetadata will be updated in the database as well as the generated %s file.')%self.OUTPUT,
                 _('Look & Feel')       : _('Adjust the look of the generated ebook by specifying things like font sizes.'),
                 _('Page Setup')        : _('Specify the page layout settings like margins.'),
-                _('Chapter Detection') : _('Fine tune the detection of chapter and section headings.'),                  
+                _('Chapter Detection') : _('Fine tune the detection of chapter and section headings.'),
                 }
         self.set_help(help[text.replace('\n', ' ')])
-    
+
     def select_cover(self):
-        files = choose_images(self, 'change cover dialog', 
+        files = choose_images(self, 'change cover dialog',
                              _('Choose cover for ') + unicode(self.title.text()))
         if not files:
             return
@@ -110,7 +110,7 @@ class Config(ResizableDialog, Ui_Dialog):
         if _file:
             _file = os.path.abspath(_file)
             if not os.access(_file, os.R_OK):
-                d = error_dialog(self.window, _('Cannot read'), 
+                d = error_dialog(self.window, _('Cannot read'),
                         _('You do not have permission to read the file: ') + _file)
                 d.exec_()
                 return
@@ -118,7 +118,7 @@ class Config(ResizableDialog, Ui_Dialog):
             try:
                 cf = open(_file, "rb")
                 cover = cf.read()
-            except IOError, e: 
+            except IOError, e:
                 d = error_dialog(self.window, _('Error reading file'),
                         _("<p>There was an error reading from file: <br /><b>") + _file + "</b></p><br />"+str(e))
                 d.exec_()
@@ -134,14 +134,14 @@ class Config(ResizableDialog, Ui_Dialog):
                     self.cover.setPixmap(pix)
                     self.cover_changed = True
                     self.cpixmap = pix
-                
+
     def initialize_metadata_options(self):
         all_series = self.db.all_series()
         all_series.sort(cmp=lambda x, y : cmp(x[1], y[1]))
         for series in all_series:
             self.series.addItem(series[1])
         self.series.setCurrentIndex(-1)
-            
+
         if self.row is not None:
             mi = self.db.get_metadata(self.id, index_is_id=True)
             self.title.setText(mi.title)
@@ -157,14 +157,14 @@ class Config(ResizableDialog, Ui_Dialog):
                 self.series.setCurrentIndex(self.series.findText(mi.series))
             if mi.series_index is not None:
                 self.series_index.setValue(mi.series_index)
-                
+
             cover = self.db.cover(self.id, index_is_id=True)
             if cover:
                 pm = QPixmap()
                 pm.loadFromData(cover)
-                if not pm.isNull(): 
-                    self.cover.setPixmap(pm)  
-                
+                if not pm.isNull():
+                    self.cover.setPixmap(pm)
+
     def get_title_and_authors(self):
         title = unicode(self.title.text()).strip()
         if not title:
@@ -172,7 +172,7 @@ class Config(ResizableDialog, Ui_Dialog):
         authors = unicode(self.author.text()).strip()
         authors = string_to_authors(authors) if authors else [_('Unknown')]
         return title, authors
-    
+
     def get_metadata(self):
         title, authors = self.get_title_and_authors()
         mi = MetaInformation(title, authors)
@@ -191,9 +191,9 @@ class Config(ResizableDialog, Ui_Dialog):
         tags = [t.strip() for t in unicode(self.tags.text()).split(',')]
         if tags:
             mi.tags = tags
-            
+
         return mi
-    
+
     def read_settings(self):
         for pref in self.config.option_set.preferences:
             g = getattr(self, 'opt_'+pref.name, False)
@@ -209,9 +209,9 @@ class Config(ResizableDialog, Ui_Dialog):
                 elif isinstance(g, QCheckBox):
                     self.config.set(pref.name, bool(g.isChecked()))
         if self.row is not None:
-            self.db.set_conversion_options(self.id, self.OUTPUT.lower(), self.config.src)        
-        
-    
+            self.db.set_conversion_options(self.id, self.OUTPUT.lower(), self.config.src)
+
+
     def initialize_options(self):
         self.initialize_metadata_options()
         values = self.config.parse()
@@ -232,16 +232,16 @@ class Config(ResizableDialog, Ui_Dialog):
                     g.setCurrentIndex(g.findText(val))
                 elif isinstance(g, QCheckBox):
                     g.setCheckState(Qt.Checked if bool(val) else Qt.Unchecked)
-                    
-        
+
+
     def get_source_format(self):
         self.source_format = None
         if self.row is not None:
             temp = self.db.formats(self.id, index_is_id=True)
             if not temp:
-                error_dialog(self.parent(), _('Cannot convert'), 
+                error_dialog(self.parent(), _('Cannot convert'),
                              _('This book has no available formats')).exec_()
-                
+
             available_formats = [f.upper().strip() for f in temp.split(',')]
             choices = [fmt.upper() for fmt in SOURCE_FORMATS if fmt.upper() in available_formats]
             if not choices:
@@ -253,7 +253,7 @@ class Config(ResizableDialog, Ui_Dialog):
                 d = ChooseFormatDialog(self.parent(), _('Choose the format to convert to ')+self.OUTPUT, choices)
                 if d.exec_() == QDialog.Accepted:
                     self.source_format = d.format()
-                
+
     def accept(self):
         for opt in ('chapter', 'level1_toc', 'level2_toc', 'level3_toc', 'page',
                     'page_names'):
@@ -263,7 +263,7 @@ class Config(ResizableDialog, Ui_Dialog):
                     XPath(text,namespaces={'re':'http://exslt.org/regular-expressions'})
                 except Exception, err:
                     error_dialog(self, _('Invalid XPath expression'),
-                        _('The expression %s is invalid. Error: %s')%(text, err) 
+                        _('The expression %s is invalid. Error: %s')%(text, err)
                                  ).exec_()
                     return
         mi = self.get_metadata()
@@ -272,6 +272,7 @@ class Config(ResizableDialog, Ui_Dialog):
         if self.row is not None:
             self.db.set_metadata(self.id, mi)
             self.mi = self.db.get_metadata(self.id, index_is_id=True)
+            self.mi.application_id = uuid.uuid4()
             opf = OPFCreator(os.getcwdu(), self.mi)
             self.opf_file = PersistentTemporaryFile('.opf')
             opf.render(self.opf_file)
@@ -286,5 +287,5 @@ class Config(ResizableDialog, Ui_Dialog):
                 self.cover_file = cf
         self.opts = self.config.parse()
         QDialog.accept(self)
-        
-            
\ No newline at end of file
+
+
diff --git a/src/calibre/gui2/dialogs/fetch_metadata.py b/src/calibre/gui2/dialogs/fetch_metadata.py
index 99d454fa7e..805cc1c3bf 100644
--- a/src/calibre/gui2/dialogs/fetch_metadata.py
+++ b/src/calibre/gui2/dialogs/fetch_metadata.py
@@ -8,14 +8,15 @@ import time
 
 from PyQt4.QtCore import Qt, QObject, SIGNAL, QVariant, QThread, \
                          QAbstractTableModel, QCoreApplication, QTimer
-from PyQt4.QtGui import QDialog, QItemSelectionModel, QWidget, QLabel, QMovie
+from PyQt4.QtGui import QDialog, QItemSelectionModel
 
 from calibre.gui2.dialogs.fetch_metadata_ui import Ui_FetchMetadata
-from calibre.gui2 import error_dialog, NONE, info_dialog, warning_dialog
+from calibre.gui2 import error_dialog, NONE, info_dialog
+from calibre.gui2.widgets import ProgressIndicator
 from calibre.utils.config import prefs
 
 class Fetcher(QThread):
-    
+
     def __init__(self, title, author, publisher, isbn, key):
         QThread.__init__(self)
         self.title = title
@@ -23,81 +24,47 @@ class Fetcher(QThread):
         self.publisher = publisher
         self.isbn = isbn
         self.key = key
-        
+
     def run(self):
         from calibre.ebooks.metadata.fetch import search
         self.results, self.exceptions = search(self.title, self.author,
-                                               self.publisher, self.isbn, 
+                                               self.publisher, self.isbn,
                                                self.key if self.key else None)
 
-class ProgressIndicator(QWidget):
-    
-    def __init__(self, *args):
-        QWidget.__init__(self, *args)
-        self.setGeometry(0, 0, 300, 350)
-        self.movie = QMovie(':/images/jobs-animated.mng')
-        self.ml = QLabel(self)
-        self.ml.setMovie(self.movie)
-        self.movie.start()
-        self.movie.setPaused(True)
-        self.status = QLabel(self)
-        self.status.setWordWrap(True)
-        self.status.setAlignment(Qt.AlignHCenter|Qt.AlignTop)
-        self.status.font().setBold(True)
-        self.status.font().setPointSize(self.font().pointSize()+6)
-        self.setVisible(False)
-        
-    def start(self, msg=''):
-        view = self.parent()
-        pwidth, pheight = view.size().width(), view.size().height()
-        self.resize(pwidth, min(pheight, 250))
-        self.move(0, (pheight-self.size().height())/2.)
-        self.ml.resize(self.ml.sizeHint())
-        self.ml.move(int((self.size().width()-self.ml.size().width())/2.), 0)
-        self.status.resize(self.size().width(), self.size().height()-self.ml.size().height()-10)
-        self.status.move(0, self.ml.size().height()+10)
-        self.status.setText(msg)
-        self.setVisible(True)
-        self.movie.setPaused(False)
-        
-    def stop(self):
-        if self.movie.state() == self.movie.Running:
-            self.movie.setPaused(True)
-            self.setVisible(False)
-            
+
 class Matches(QAbstractTableModel):
-    
+
     def __init__(self, matches):
         self.matches = matches
         self.matches.sort(cmp=lambda b, a: \
-                        cmp(len(a.comments if a.comments else ''), 
+                        cmp(len(a.comments if a.comments else ''),
                             len(b.comments if b.comments else '')))
         QAbstractTableModel.__init__(self)
-        
+
     def rowCount(self, *args):
         return len(self.matches)
-    
+
     def columnCount(self, *args):
         return 5
-    
+
     def headerData(self, section, orientation, role):
         if role != Qt.DisplayRole:
             return NONE
         text = ""
-        if orientation == Qt.Horizontal:      
+        if orientation == Qt.Horizontal:
             if   section == 0: text = _("Title")
             elif section == 1: text = _("Author(s)")
             elif section == 2: text = _("Author Sort")
             elif section == 3: text = _("Publisher")
             elif section == 4: text = _("ISBN")
-            
+
             return QVariant(text)
-        else: 
+        else:
             return QVariant(section+1)
-        
+
     def summary(self, row):
         return self.matches[row].comments
-    
+
     def data(self, index, role):
         row, col = index.row(), index.column()
         if role == Qt.DisplayRole:
@@ -119,39 +86,41 @@ class Matches(QAbstractTableModel):
         return NONE
 
 class FetchMetadata(QDialog, Ui_FetchMetadata):
-    
+
     def __init__(self, parent, isbn, title, author, publisher, timeout):
         QDialog.__init__(self, parent)
         Ui_FetchMetadata.__init__(self)
         self.setupUi(self)
-        
+
         self.pi = ProgressIndicator(self)
         self.timeout = timeout
         QObject.connect(self.fetch, SIGNAL('clicked()'), self.fetch_metadata)
-        
+
         self.key.setText(prefs['isbndb_com_key'])
-        
+
         self.setWindowTitle(title if title else _('Unknown'))
         self.isbn = isbn
         self.title = title
         self.author = author.strip()
         self.publisher = publisher
         self.previous_row = None
+        self.warning.setVisible(False)
         self.connect(self.matches, SIGNAL('activated(QModelIndex)'), self.chosen)
-        self.connect(self.matches, SIGNAL('entered(QModelIndex)'), 
-                     lambda index:self.matches.setCurrentIndex(index))
+        self.connect(self.matches, SIGNAL('entered(QModelIndex)'),
+                     self.show_summary)
         self.matches.setMouseTracking(True)
         self.fetch_metadata()
-        
-        
-    def show_summary(self, current, previous):
+
+
+    def show_summary(self, current, *args):
         row  = current.row()
         if row != self.previous_row:
             summ =  self.model.summary(row)
             self.summary.setText(summ if summ else '')
             self.previous_row = row
-        
+
     def fetch_metadata(self):
+        self.warning.setVisible(False)
         key = str(self.key.text())
         if key:
             prefs['isbndb_com_key'] =  key
@@ -173,8 +142,8 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
         self._hangcheck = QTimer(self)
         self.connect(self._hangcheck, SIGNAL('timeout()'), self.hangcheck)
         self.start_time = time.time()
-        self._hangcheck.start()
-        
+        self._hangcheck.start(100)
+
     def hangcheck(self):
         if not (self.fetcher.isFinished() or time.time() - self.start_time > 75):
             return
@@ -191,22 +160,22 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
                             self.fetcher.exceptions if x[1] is not None]
             if warnings:
                 warnings='<br>'.join(['<b>%s</b>: %s'%(name, exc) for name,exc in warnings])
-                warning_dialog(self, _('Warning'),
-                               '<p>'+_('Could not fetch metadata from:')+\
-                               '<br><br>'+warnings+'</p>').exec_()
+                self.warning.setText('<p><b>'+ _('Warning')+':</b>'+\
+                               _('Could not fetch metadata from:')+\
+                               '<br>'+warnings+'</p>')
+                self.warning.setVisible(True)
             if self.model.rowCount() < 1:
                 info_dialog(self, _('No metadata found'),
                      _('No metadata found, try adjusting the title and author '
                        'or the ISBN key.')).exec_()
-                self.reject()
                 return
-            
+
             self.matches.setModel(self.model)
-            QObject.connect(self.matches.selectionModel(), 
+            QObject.connect(self.matches.selectionModel(),
                         SIGNAL('currentRowChanged(QModelIndex, QModelIndex)'),
                         self.show_summary)
             self.model.reset()
-            self.matches.selectionModel().select(self.model.index(0, 0), 
+            self.matches.selectionModel().select(self.model.index(0, 0),
                                   QItemSelectionModel.Select | QItemSelectionModel.Rows)
             self.matches.setCurrentIndex(self.model.index(0, 0))
         finally:
@@ -214,14 +183,24 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
             self.unsetCursor()
             self.matches.resizeColumnsToContents()
             self.pi.stop()
-            
-        
+
+    def terminate(self):
+        if hasattr(self, 'fetcher') and self.fetcher.isRunning():
+            self.fetcher.terminate()
+
+
+    def __enter__(self, *args):
+        return self
+
+    def __exit__(self, *args):
+        self.terminate()
+
     def selected_book(self):
         try:
             return self.matches.model().matches[self.matches.currentIndex().row()]
         except:
             return None
-        
+
     def chosen(self, index):
         self.matches.setCurrentIndex(index)
         self.accept()
diff --git a/src/calibre/gui2/dialogs/fetch_metadata.ui b/src/calibre/gui2/dialogs/fetch_metadata.ui
index 9adc1fa5e5..653c7005b8 100644
--- a/src/calibre/gui2/dialogs/fetch_metadata.ui
+++ b/src/calibre/gui2/dialogs/fetch_metadata.ui
@@ -23,7 +23,7 @@
    <item>
     <widget class="QLabel" name="tlabel" >
      <property name="text" >
-      <string>&lt;p>calibre can find metadata for your books from two locations: &lt;b>Google Books&lt;/b> and &lt;b>isbndb.com&lt;/b>. &lt;p>To use isbndb.com you must sign up for a &lt;a href="http://www.isbndb.com">free account&lt;/a> and exter you access key below.</string>
+      <string>&lt;p>calibre can find metadata for your books from two locations: &lt;b>Google Books&lt;/b> and &lt;b>isbndb.com&lt;/b>. &lt;p>To use isbndb.com you must sign up for a &lt;a href="http://www.isbndb.com">free account&lt;/a> and enter your access key below.</string>
      </property>
      <property name="alignment" >
       <set>Qt::AlignCenter</set>
@@ -60,6 +60,16 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QLabel" name="warning" >
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
diff --git a/src/calibre/gui2/dialogs/jobs.py b/src/calibre/gui2/dialogs/jobs.py
index 5b97934a84..c6907c6b60 100644
--- a/src/calibre/gui2/dialogs/jobs.py
+++ b/src/calibre/gui2/dialogs/jobs.py
@@ -10,10 +10,10 @@ from calibre.gui2.dialogs.jobs_ui import Ui_JobsDialog
 from calibre import __appname__
 
 class ProgressBarDelegate(QAbstractItemDelegate):
-    
+
     def sizeHint(self, option, index):
         return QSize(120, 30)
-    
+
     def paint(self, painter, option, index):
         opts = QStyleOptionProgressBarV2()
         opts.rect = option.rect
@@ -44,20 +44,23 @@ class JobsDialog(QDialog, Ui_JobsDialog):
                         self.jobs_view.model().kill_job)
         self.pb_delegate = ProgressBarDelegate(self)
         self.jobs_view.setItemDelegateForColumn(2, self.pb_delegate)
-        
+
         self.running_time_timer = QTimer(self)
         self.connect(self.running_time_timer, SIGNAL('timeout()'), self.update_running_time)
         self.running_time_timer.start(1000)
-        
+
     def update_running_time(self, *args):
-        self.model.running_time_updated()
-    
+        try:
+            self.model.running_time_updated()
+        except: # Raises random exceptions on OS X
+            pass
+
     def kill_job(self):
         for index in self.jobs_view.selectedIndexes():
             row = index.row()
             self.model.kill_job(row, self)
             return
-    
+
     def closeEvent(self, e):
         self.jobs_view.write_settings()
         e.accept()
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 132355b12a..7d388b077e 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -70,14 +70,14 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
             pub = qstring_to_unicode(self.publisher.text())
             if pub:
                 self.db.set_publisher(id, pub, notify=False)
-            tags = qstring_to_unicode(self.tags.text()).strip()
-            if tags:
-                tags = map(lambda x: x.strip(), tags.split(','))
-                self.db.set_tags(id, tags, append=True, notify=False)
             remove_tags = qstring_to_unicode(self.remove_tags.text()).strip()
             if remove_tags:
                 remove_tags = [i.strip() for i in remove_tags.split(',')]
                 self.db.unapply_tags(id, remove_tags, notify=False)
+            tags = qstring_to_unicode(self.tags.text()).strip()
+            if tags:
+                tags = map(lambda x: x.strip(), tags.split(','))
+                self.db.set_tags(id, tags, append=True, notify=False)
             if self.write_series:
                 self.db.set_series(id, qstring_to_unicode(self.series.currentText()), notify=False)
                 
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 694fec21f3..a9d20905c6 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -1,12 +1,13 @@
+from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-''' 
-The dialog used to edit meta information for a book as well as 
+'''
+The dialog used to edit meta information for a book as well as
 add/remove formats
 '''
-import os
+import os, time, traceback
 
-from PyQt4.QtCore import SIGNAL, QObject, QCoreApplication, Qt
+from PyQt4.QtCore import SIGNAL, QObject, QCoreApplication, Qt, QTimer, QThread
 from PyQt4.QtGui import QPixmap, QListWidgetItem, QErrorMessage, QDialog, QCompleter
 
 
@@ -16,39 +17,60 @@ from calibre.gui2.dialogs.metadata_single_ui import Ui_MetadataSingleDialog
 from calibre.gui2.dialogs.fetch_metadata import FetchMetadata
 from calibre.gui2.dialogs.tag_editor import TagEditor
 from calibre.gui2.dialogs.password import PasswordDialog
+from calibre.gui2.widgets import ProgressIndicator
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.metadata import authors_to_sort_string, string_to_authors, authors_to_string
-from calibre.ebooks.metadata.library_thing import login, cover_from_isbn, LibraryThingError
+from calibre.ebooks.metadata.library_thing import login, cover_from_isbn
 from calibre import islinux
 from calibre.ebooks.metadata.meta import get_metadata
 from calibre.utils.config import prefs
 from calibre.customize.ui import run_plugins_on_import
 
+class CoverFetcher(QThread):
+
+    def __init__(self, username, password, isbn, timeout):
+        self.username = username
+        self.password = password
+        self.timeout = timeout
+        self.isbn = isbn
+        QThread.__init__(self)
+        self.exception = self.traceback = self.cover_data = None
+
+    def run(self):
+        try:
+            login(self.username, self.password, force=False)
+            self.cover_data = cover_from_isbn(self.isbn, timeout=self.timeout)[0]
+        except Exception, e:
+            self.exception = e
+            self.traceback = traceback.format_exc()
+
+
+
 class Format(QListWidgetItem):
     def __init__(self, parent, ext, size, path=None):
         self.path = path
         self.ext = ext
         self.size = float(size)/(1024*1024)
         text = '%s (%.2f MB)'%(self.ext.upper(), self.size)
-        QListWidgetItem.__init__(self, file_icon_provider().icon_from_ext(ext), 
+        QListWidgetItem.__init__(self, file_icon_provider().icon_from_ext(ext),
                                  text, parent, QListWidgetItem.UserType)
 
 class AuthorCompleter(QCompleter):
-    
+
     def __init__(self, db):
         all_authors = db.all_authors()
         all_authors.sort(cmp=lambda x, y : cmp(x[1], y[1]))
         QCompleter.__init__(self, [x[1] for x in all_authors])
 
 class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
-    
+
     def do_reset_cover(self, *args):
         pix = QPixmap(':/images/book.svg')
         self.cover.setPixmap(pix)
         self.cover_changed = True
-    
+
     def select_cover(self, checked):
-        files = choose_images(self, 'change cover dialog', 
+        files = choose_images(self, 'change cover dialog',
                              u'Choose cover for ' + qstring_to_unicode(self.title.text()))
         if not files:
             return
@@ -56,7 +78,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         if _file:
             _file = os.path.abspath(_file)
             if not os.access(_file, os.R_OK):
-                d = error_dialog(self.window, _('Cannot read'), 
+                d = error_dialog(self.window, _('Cannot read'),
                         _('You do not have permission to read the file: ') + _file)
                 d.exec_()
                 return
@@ -64,7 +86,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
             try:
                 cf = open(_file, "rb")
                 cover = cf.read()
-            except IOError, e: 
+            except IOError, e:
                 d = error_dialog(self.window, _('Error reading file'),
                         _("<p>There was an error reading from file: <br /><b>") + _file + "</b></p><br />"+str(e))
                 d.exec_()
@@ -78,15 +100,15 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                     self.cover_path.setText(_file)
                     self.cover.setPixmap(pix)
                     self.cover_changed = True
-                    self.cpixmap = pix                  
-    
-    
+                    self.cpixmap = pix
+
+
     def add_format(self, x):
-        files = choose_files(self, 'add formats dialog', 
+        files = choose_files(self, 'add formats dialog',
                              "Choose formats for " + qstring_to_unicode((self.title.text())),
                              [('Books', BOOK_EXTENSIONS)])
-        if not files: 
-            return      
+        if not files:
+            return
         for _file in files:
             _file = os.path.abspath(_file)
             if not os.access(_file, os.R_OK):
@@ -103,13 +125,13 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                     break
             Format(self.formats, ext, size, path=_file)
             self.formats_changed = True
-    
+
     def remove_format(self, x):
         rows = self.formats.selectionModel().selectedRows(0)
         for row in rows:
             self.formats.takeItem(row.row())
             self.formats_changed = True
-    
+
     def set_cover(self):
         row = self.formats.currentRow()
         fmt = self.formats.item(row)
@@ -134,19 +156,19 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         elif mi.cover_data[1] is not None:
             cdata = mi.cover_data[1]
         if cdata is None:
-            error_dialog(self, _('Could not read cover'), 
+            error_dialog(self, _('Could not read cover'),
                          _('Could not read cover from %s format')%ext).exec_()
             return
         pix = QPixmap()
         pix.loadFromData(cdata)
         if pix.isNull():
-            error_dialog(self, _('Could not read cover'), 
+            error_dialog(self, _('Could not read cover'),
                          _('The cover in the %s format is invalid')%ext).exec_()
             return
         self.cover.setPixmap(pix)
         self.cover_changed = True
         self.cpixmap = pix
-    
+
     def sync_formats(self):
         old_extensions, new_extensions, paths = set(), set(), {}
         for row in range(self.formats.count()):
@@ -166,12 +188,13 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         for ext in db_extensions:
             if ext not in extensions:
                 self.db.remove_format(self.row, ext, notify=False)
-    
+
     def __init__(self, window, row, db, accepted_callback=None):
         ResizableDialog.__init__(self, window)
         self.bc_box.layout().setAlignment(self.cover, Qt.AlignCenter|Qt.AlignHCenter)
         self.splitter.setStretchFactor(100, 1)
         self.db = db
+        self.pi = ProgressIndicator(self)
         self.accepted_callback = accepted_callback
         self.id = db.id(row)
         self.row = row
@@ -189,12 +212,12 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                                                     self.add_format)
         QObject.connect(self.remove_format_button, SIGNAL("clicked(bool)"), \
                                                 self.remove_format)
-        QObject.connect(self.fetch_metadata_button, SIGNAL('clicked()'), 
+        QObject.connect(self.fetch_metadata_button, SIGNAL('clicked()'),
                         self.fetch_metadata)
-        
-        QObject.connect(self.fetch_cover_button, SIGNAL('clicked()'), 
+
+        QObject.connect(self.fetch_cover_button, SIGNAL('clicked()'),
                         self.fetch_cover)
-        QObject.connect(self.tag_editor_button, SIGNAL('clicked()'), 
+        QObject.connect(self.tag_editor_button, SIGNAL('clicked()'),
                         self.edit_tags)
         QObject.connect(self.remove_series_button, SIGNAL('clicked()'),
                         self.remove_unused_series)
@@ -220,28 +243,28 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         tags = self.db.tags(row)
         self.tags.setText(tags if tags else '')
         rating = self.db.rating(row)
-        if rating > 0: 
+        if rating > 0:
             self.rating.setValue(int(rating/2.))
         comments = self.db.comments(row)
         self.comments.setPlainText(comments if comments else '')
         cover = self.db.cover(row)
-        
+
         exts = self.db.formats(row)
         if exts:
-            exts = exts.split(',')        
+            exts = exts.split(',')
             for ext in exts:
                 if not ext:
                     ext = ''
                 size = self.db.sizeof_format(row, ext)
                 Format(self.formats, ext, size)
-        
-            
+
+
         self.initialize_series_and_publisher()
-            
+
         self.series_index.setValue(self.db.series_index(row))
         QObject.connect(self.series, SIGNAL('currentIndexChanged(int)'), self.enable_series_index)
         QObject.connect(self.series, SIGNAL('editTextChanged(QString)'), self.enable_series_index)
-        QObject.connect(self.password_button, SIGNAL('clicked()'), self.change_password) 
+        QObject.connect(self.password_button, SIGNAL('clicked()'), self.change_password)
 
         self.show()
         height_of_rest = self.frameGeometry().height() - self.cover.height()
@@ -252,14 +275,14 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         if cover:
             pm = QPixmap()
             pm.loadFromData(cover)
-            if not pm.isNull(): 
+            if not pm.isNull():
                 self.cover.setPixmap(pm)
-    
+
     def deduce_author_sort(self):
         au = unicode(self.authors.text())
         authors = string_to_authors(au)
         self.author_sort.setText(authors_to_sort_string(authors))
-    
+
     def swap_title_author(self):
         title = self.title.text()
         self.title.setText(self.authors.text())
@@ -268,7 +291,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
 
     def cover_dropped(self):
         self.cover_changed = True
-    
+
     def initialize_series(self):
         all_series = self.db.all_series()
         all_series.sort(cmp=lambda x, y : cmp(x[1], y[1]))
@@ -280,19 +303,19 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                 idx = c
             self.series.addItem(name)
             c += 1
-        
+
         self.series.lineEdit().setText('')
         if idx is not None:
             self.series.setCurrentIndex(idx)
             self.enable_series_index()
-        
+
         pl = self.series.parentWidget().layout()
         for i in range(pl.count()):
             l =  pl.itemAt(i).layout()
             if l:
                 l.invalidate()
                 l.activate()
-        
+
     def initialize_series_and_publisher(self):
         self.initialize_series()
         all_publishers = self.db.all_publishers()
@@ -305,73 +328,93 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                 idx = c
             self.publisher.addItem(name)
             c += 1
-        
+
         self.publisher.setEditText('')
         if idx is not None:
             self.publisher.setCurrentIndex(idx)
-        
-                
+
+
         self.layout().activate()
-    
+
     def edit_tags(self):
         d = TagEditor(self, self.db, self.row)
         d.exec_()
         if d.result() == QDialog.Accepted:
             tag_string = ', '.join(d.tags)
             self.tags.setText(tag_string)
-    
+
     def lt_password_dialog(self):
-        return PasswordDialog(self, 'LibraryThing account', 
+        return PasswordDialog(self, 'LibraryThing account',
                  _('<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you do not have one, you can <a href=\'http://www.librarything.com\'>register</a> for free!.</p>'))
-    
+
     def change_password(self):
-        d = self.lt_password_dialog() 
+        d = self.lt_password_dialog()
         d.exec_()
-    
+
     def fetch_cover(self):
         isbn   = qstring_to_unicode(self.isbn.text())
         if isbn:
-            d = self.lt_password_dialog() 
+            d = self.lt_password_dialog()
             if not d.username() or not d.password():
                 d.exec_()
                 if d.result() != PasswordDialog.Accepted:
                     return
             self.fetch_cover_button.setEnabled(False)
             self.setCursor(Qt.WaitCursor)
-            QCoreApplication.instance().processEvents()
-            try:
-                login(d.username(), d.password(), force=False)
-                cover_data = cover_from_isbn(isbn, timeout=self.timeout)[0]
-            
-                pix = QPixmap()
-                pix.loadFromData(cover_data)
-                if pix.isNull():
-                    error_dialog(self.window, _('Bad cover'), 
-                                 _('The cover is not a valid picture')).exec_()
-                else:
-                    self.cover.setPixmap(pix)
-                    self.cover_changed = True
-                    self.cpixmap = pix
-            except LibraryThingError, err:
-                error_dialog(self, _('Cannot fetch cover'), 
-                    _('<b>Could not fetch cover.</b><br/>')+repr(err)).exec_()
-            finally:
-                self.fetch_cover_button.setEnabled(True)
-                self.unsetCursor()
-                
+            self.cover_fetcher = CoverFetcher(d.username(), d.password(), isbn,
+                                              self.timeout)
+            self.cover_fetcher.start()
+            self._hangcheck = QTimer(self)
+            self.connect(self._hangcheck, SIGNAL('timeout()'), self.hangcheck)
+            self.cf_start_time = time.time()
+            self.pi.start(_('Downloading cover...'))
+            self._hangcheck.start(100)
         else:
-            error_dialog(self, _('Cannot fetch cover'), 
-                _('You must specify the ISBN identifier for this book.')).exec_()
-                
-    
+            error_dialog(self, _('Cannot fetch cover'),
+            _('You must specify the ISBN identifier for this book.')).exec_()
+
+    def hangcheck(self):
+        if not (self.cover_fetcher.isFinished() or time.time()-self.cf_start_time > 150):
+            return
+
+        self._hangcheck.stop()
+        try:
+            if self.cover_fetcher.isRunning():
+                self.cover_fetcher.terminate()
+                error_dialog(self, _('Cannot fetch cover'),
+                    _('<b>Could not fetch cover.</b><br/>')+
+                    _('The download timed out.')).exec_()
+                return
+            if self.cover_fetcher.exception is not None:
+                err = self.cover_fetcher.exception
+                error_dialog(self, _('Cannot fetch cover'),
+                    _('<b>Could not fetch cover.</b><br/>')+repr(err)).exec_()
+                return
+
+            pix = QPixmap()
+            pix.loadFromData(self.cover_fetcher.cover_data)
+            if pix.isNull():
+                error_dialog(self.window, _('Bad cover'),
+                             _('The cover is not a valid picture')).exec_()
+            else:
+                self.cover.setPixmap(pix)
+                self.cover_changed = True
+                self.cpixmap = pix
+        finally:
+            self.fetch_cover_button.setEnabled(True)
+            self.unsetCursor()
+            self.pi.stop()
+
+
     def fetch_metadata(self):
         isbn   = qstring_to_unicode(self.isbn.text())
         title  = qstring_to_unicode(self.title.text())
         author = string_to_authors(unicode(self.authors.text()))[0]
-        publisher = qstring_to_unicode(self.publisher.currentText()) 
+        publisher = qstring_to_unicode(self.publisher.currentText())
         if isbn or title or author or publisher:
             d = FetchMetadata(self, isbn, title, author, publisher, self.timeout)
-            d.exec_()
+            with d:
+                d.exec_()
             if d.result() == QDialog.Accepted:
                 book = d.selected_book()
                 if book:
@@ -387,11 +430,13 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                             prefix += '\n'
                         self.comments.setText(prefix + summ)
         else:
-            error_dialog(self, 'Cannot fetch metadata', 'You must specify at least one of ISBN, Title, Authors or Publisher')
-             
+            error_dialog(self, _('Cannot fetch metadata'),
+                         _('You must specify at least one of ISBN, Title, '
+                           'Authors or Publisher'))
+
     def enable_series_index(self, *args):
         self.series_index.setEnabled(True)
-    
+
     def remove_unused_series(self):
         self.db.remove_unused_series()
         idx = qstring_to_unicode(self.series.currentText())
@@ -402,15 +447,15 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                 if qstring_to_unicode(self.series.itemText(i)) == idx:
                     self.series.setCurrentIndex(i)
                     break
-        
-    
+
+
     def accept(self):
         if self.formats_changed:
             self.sync_formats()
         title = qstring_to_unicode(self.title.text())
         self.db.set_title(self.id, title, notify=False)
         au = unicode(self.authors.text())
-        if au: 
+        if au:
             self.db.set_authors(self.id, string_to_authors(au), notify=False)
         aus = qstring_to_unicode(self.author_sort.text())
         if aus:
diff --git a/src/calibre/gui2/dialogs/search.py b/src/calibre/gui2/dialogs/search.py
index 403bb7f287..f41a80e620 100644
--- a/src/calibre/gui2/dialogs/search.py
+++ b/src/calibre/gui2/dialogs/search.py
@@ -6,13 +6,13 @@ from PyQt4.QtGui import QDialog
 from calibre.gui2.dialogs.search_ui import Ui_Dialog
 from calibre.gui2 import qstring_to_unicode
 
-        
+
 class SearchDialog(QDialog, Ui_Dialog):
-    
+
     def __init__(self, *args):
         QDialog.__init__(self, *args)
         self.setupUi(self)
-    
+
     def tokens(self, raw):
         phrases = re.findall(r'\s+".*?"\s+', raw)
         for f in phrases:
@@ -20,7 +20,8 @@ class SearchDialog(QDialog, Ui_Dialog):
         return [t.strip() for t in phrases + raw.split()]
 
     def search_string(self):
-        all, any, phrase, none = map(lambda x: unicode(x.text()), (self.all, self.any, self.phrase, self.none))
+        all, any, phrase, none = map(lambda x: unicode(x.text()),
+                (self.all, self.any, self.phrase, self.none))
         all, any, none = map(self.tokens, (all, any, none))
         phrase = phrase.strip()
         all = ' and '.join(all)
@@ -32,11 +33,11 @@ class SearchDialog(QDialog, Ui_Dialog):
         if all:
             ans += (' and ' if ans else '') + all
         if none:
-            ans += (' and not ' if ans else '') + none
+            ans += (' and not ' if ans else 'not ') + none
         if any:
             ans += (' or ' if ans else '') + any
         return ans
-    
+
     def token(self):
         txt = qstring_to_unicode(self.text.text()).strip()
         if txt:
@@ -46,4 +47,4 @@ class SearchDialog(QDialog, Ui_Dialog):
             if re.search(r'\s', tok):
                 tok = '"%s"'%tok
             return tok
-    
+
diff --git a/src/calibre/gui2/dialogs/test_email.ui b/src/calibre/gui2/dialogs/test_email.ui
new file mode 100644
index 0000000000..f1d5568c03
--- /dev/null
+++ b/src/calibre/gui2/dialogs/test_email.ui
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>542</width>
+    <height>418</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Test email settings</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../images.qrc">
+    <normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="from_">
+     <property name="text">
+      <string>Send test mail from %s to:</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="to"/>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="test_button">
+     <property name="text">
+      <string>&amp;Test</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPlainTextEdit" name="log"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../images.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/calibre/gui2/images/gmail_logo.png b/src/calibre/gui2/images/gmail_logo.png
new file mode 100644
index 0000000000..e145f6e0f1
Binary files /dev/null and b/src/calibre/gui2/images/gmail_logo.png differ
diff --git a/src/calibre/gui2/images/mail.svg b/src/calibre/gui2/images/mail.svg
new file mode 100644
index 0000000000..cd3dfa114d
--- /dev/null
+++ b/src/calibre/gui2/images/mail.svg
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg3007"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/david/Documents/Projects/KDE/Oxygen/kdelibs/scalable/actions"
+   sodipodi:docname="mail.svgz"
+   inkscape:output_extension="org.inkscape.output.svgz.inkscape"
+   inkscape:export-filename="/home/david/Documents/Projects/KDE/Oxygen/kdelibs/scalable/actions/mail.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3009">
+    <linearGradient
+       id="polygon3293_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="615.5"
+       y1="-584.6021"
+       x2="615.5"
+       y2="-595.8521"
+       gradientTransform="matrix(4,0,0,-4,-2402,-2314.406)">
+      <stop
+         offset="0"
+         style="stop-color:#6193CF"
+         id="stop2997" />
+      <stop
+         offset="1"
+         style="stop-color:#EEEEEE"
+         id="stop2999" />
+    </linearGradient>
+    <linearGradient
+       id="polygon3286_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="615.5"
+       y1="-589.8511"
+       x2="615.5"
+       y2="-580.6011"
+       gradientTransform="matrix(4,0,0,-4,-2402,-2314.406)">
+      <stop
+         offset="0"
+         style="stop-color:#6193CF"
+         id="stop2991" />
+      <stop
+         offset="1"
+         style="stop-color:#D1DFF1"
+         id="stop2993" />
+    </linearGradient>
+    <linearGradient
+       id="rect3244_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="59.9995"
+       y1="4"
+       x2="59.9995"
+       y2="72.0005"
+       gradientTransform="matrix(1,0,0,1.0588235,0,-0.2352941)">
+      <stop
+         offset="0"
+         style="stop-color:#A4C0E4"
+         id="stop2983" />
+      <stop
+         offset="0.25"
+         style="stop-color:#D1DFF1"
+         id="stop2985" />
+      <stop
+         offset="0.85"
+         style="stop-color:#FFFFFF"
+         id="stop2987" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#rect3244_1_"
+       id="linearGradient2212"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0588235,0,-0.2352941)"
+       x1="59.9995"
+       y1="4"
+       x2="59.9995"
+       y2="72.0005" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#polygon3286_1_"
+       id="linearGradient2214"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4,0,0,-4,-2402,-2314.406)"
+       x1="615.5"
+       y1="-589.8511"
+       x2="615.5"
+       y2="-580.6011" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#polygon3293_1_"
+       id="linearGradient2216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4,0,0,-4,-2402,-2314.406)"
+       x1="615.5"
+       y1="-584.6021"
+       x2="615.5"
+       y2="-595.8521" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:document-units="px"
+     inkscape:current-layer="g2972"
+     width="128px"
+     height="128px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="794"
+     inkscape:window-height="731"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showgrid="true"
+     gridspacingx="4px"
+     gridspacingy="4px"
+     gridempspacing="2"
+     showborder="false" />
+  <metadata
+     id="metadata3012">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <switch
+       id="switch2966"
+       transform="translate(4,12)">
+      <foreignObject
+         requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+         x="0"
+         y="0"
+         width="1"
+         height="1"
+         id="foreignObject2968">
+        <i:pgfRef
+           xlink:href="#adobe_illustrator_pgf" />
+      </foreignObject>
+      <g
+         i:extraneous="self"
+         id="g2970">
+        <g
+           id="g2972">
+          <linearGradient
+             id="linearGradient3033"
+             gradientUnits="userSpaceOnUse"
+             x1="59.9995"
+             y1="4"
+             x2="59.9995"
+             y2="72.000504">
+            <stop
+               offset="0"
+               style="stop-color:#A4C0E4"
+               id="stop3035" />
+            <stop
+               offset="0.25"
+               style="stop-color:#D1DFF1"
+               id="stop3037" />
+            <stop
+               offset="0.85"
+               style="stop-color:#FFFFFF"
+               id="stop3039" />
+          </linearGradient>
+          <linearGradient
+             id="linearGradient3042"
+             gradientUnits="userSpaceOnUse"
+             x1="615.5"
+             y1="-589.85107"
+             x2="615.5"
+             y2="-580.60107"
+             gradientTransform="matrix(4,0,0,-4,-2402,-2314.406)">
+            <stop
+               offset="0"
+               style="stop-color:#6193CF"
+               id="stop3044" />
+            <stop
+               offset="1"
+               style="stop-color:#D1DFF1"
+               id="stop3046" />
+          </linearGradient>
+          <linearGradient
+             id="linearGradient3049"
+             gradientUnits="userSpaceOnUse"
+             x1="615.5"
+             y1="-584.60211"
+             x2="615.5"
+             y2="-595.85211"
+             gradientTransform="matrix(4,0,0,-4,-2402,-2314.406)">
+            <stop
+               offset="0"
+               style="stop-color:#6193CF"
+               id="stop3051" />
+            <stop
+               offset="1"
+               style="stop-color:#EEEEEE"
+               id="stop3053" />
+          </linearGradient>
+          <g
+             id="g2202"
+             transform="translate(0,8)">
+            <path
+               style="opacity:0.1"
+               id="path2974"
+               d="M 4,0 C 1.794,0 0,1.8884211 0,4.2105263 L 0,75.789474 C 0,78.111579 1.794,80 4,80 L 116,80 C 118.206,80 120,78.111579 120,75.789474 L 120,4.2105263 C 120,1.8884211 118.206,0 116,0 L 4,0 z " />
+            <path
+               style="opacity:0.15"
+               id="path2976"
+               d="M 4,1 C 2.346,1 1,2.4187568 1,4.1621622 L 1,75.837838 C 1,77.581243 2.346,79 4,79 L 116,79 C 117.654,79 119,77.581243 119,75.837838 L 119,4.1621622 C 119,2.4187568 117.654,1 116,1 L 4,1 z " />
+            <path
+               style="opacity:0.2"
+               id="path2978"
+               d="M 4,2 C 2.897,2 2,2.9468333 2,4.1111111 L 2,75.888889 C 2,77.053167 2.897,78 4,78 L 116,78 C 117.103,78 118,77.053167 118,75.888889 L 118,4.1111111 C 118,2.9468333 117.103,2 116,2 L 4,2 z " />
+            <path
+               style="opacity:0.25"
+               id="path2980"
+               d="M 4,3 C 3.448,3 3,3.4736 3,4.0571428 L 3,75.942857 C 3,76.527457 3.448,77 4,77 L 116,77 C 116.553,77 117,76.527457 117,75.942857 L 117,4.0571428 C 117,3.4736 116.553,3 116,3 L 4,3 z " />
+            <rect
+               style="fill:url(#linearGradient2212)"
+               height="72"
+               width="112"
+               y="4"
+               x="4"
+               id="rect3244_9_" />
+            <polygon
+               style="fill:url(#linearGradient2214)"
+               points="4,8 4,12 60,45 116,12 116,8 60,41 4,8 "
+               id="polygon3286_9_" />
+            <polygon
+               style="fill:url(#linearGradient2216)"
+               points="116,69 116,65 59.997,24 4,65 4,69 59.997,28 116,69 "
+               id="polygon3293_9_" />
+            <polygon
+               style="fill:#ffffff"
+               id="polygon3002"
+               points="4,8 60.004,40.967 116,8 116,4 4,4 4,8 " />
+          </g>
+        </g>
+      </g>
+    </switch>
+  </g>
+</svg>
diff --git a/src/calibre/gui2/images/news/24sata_rs.png b/src/calibre/gui2/images/news/24sata_rs.png
new file mode 100644
index 0000000000..21736bd8f9
Binary files /dev/null and b/src/calibre/gui2/images/news/24sata_rs.png differ
diff --git a/src/calibre/gui2/images/news/dnevni_avaz.png b/src/calibre/gui2/images/news/dnevni_avaz.png
new file mode 100644
index 0000000000..bfbddf387a
Binary files /dev/null and b/src/calibre/gui2/images/news/dnevni_avaz.png differ
diff --git a/src/calibre/gui2/images/news/glas_srpske.png b/src/calibre/gui2/images/news/glas_srpske.png
new file mode 100644
index 0000000000..d9871856a3
Binary files /dev/null and b/src/calibre/gui2/images/news/glas_srpske.png differ
diff --git a/src/calibre/gui2/images/news/krstarica.png b/src/calibre/gui2/images/news/krstarica.png
new file mode 100644
index 0000000000..92eecfc4e0
Binary files /dev/null and b/src/calibre/gui2/images/news/krstarica.png differ
diff --git a/src/calibre/gui2/images/news/krstarica_en.png b/src/calibre/gui2/images/news/krstarica_en.png
new file mode 100644
index 0000000000..92eecfc4e0
Binary files /dev/null and b/src/calibre/gui2/images/news/krstarica_en.png differ
diff --git a/src/calibre/gui2/images/news/tanjug.png b/src/calibre/gui2/images/news/tanjug.png
new file mode 100644
index 0000000000..be1128073c
Binary files /dev/null and b/src/calibre/gui2/images/news/tanjug.png differ
diff --git a/src/calibre/gui2/jobs2.py b/src/calibre/gui2/jobs2.py
index 10b3853907..fc6ddb642e 100644
--- a/src/calibre/gui2/jobs2.py
+++ b/src/calibre/gui2/jobs2.py
@@ -18,27 +18,27 @@ from calibre.gui2.dialogs.job_view_ui import Ui_Dialog
 NONE = QVariant()
 
 class JobManager(QAbstractTableModel):
-    
+
     def __init__(self):
         QAbstractTableModel.__init__(self)
         self.wait_icon     = QVariant(QIcon(':/images/jobs.svg'))
         self.running_icon  = QVariant(QIcon(':/images/exec.svg'))
         self.error_icon    = QVariant(QIcon(':/images/dialog_error.svg'))
         self.done_icon     = QVariant(QIcon(':/images/ok.svg'))
-    
+
         self.jobs          = []
         self.server        = Server()
         self.add_job       = Dispatcher(self._add_job)
         self.status_update = Dispatcher(self._status_update)
         self.start_work    = Dispatcher(self._start_work)
         self.job_done      = Dispatcher(self._job_done)
-        
+
     def columnCount(self, parent=QModelIndex()):
         return 4
-    
+
     def rowCount(self, parent=QModelIndex()):
         return len(self.jobs)
-    
+
     def headerData(self, section, orientation, role):
         if role != Qt.DisplayRole:
             return NONE
@@ -50,14 +50,14 @@ class JobManager(QAbstractTableModel):
             return QVariant(text)
         else:
             return QVariant(section+1)
-        
+
     def data(self, index, role):
         try:
             if role not in (Qt.DisplayRole, Qt.DecorationRole):
                 return NONE
             row, col = index.row(), index.column()
             job = self.jobs[row]
-            
+
             if role == Qt.DisplayRole:
                 if col == 0:
                     desc = job.description
@@ -102,31 +102,31 @@ class JobManager(QAbstractTableModel):
             import traceback
             traceback.print_exc()
         return NONE
-        
+
     def _add_job(self, job):
         self.emit(SIGNAL('layoutAboutToBeChanged()'))
         self.jobs.append(job)
         self.jobs.sort()
         self.emit(SIGNAL('job_added(int)'), self.rowCount())
         self.emit(SIGNAL('layoutChanged()'))
-        
+
     def done_jobs(self):
         return [j for j in self.jobs if j.status() in ['DONE', 'ERROR']]
-    
+
     def row_to_job(self, row):
         return self.jobs[row]
-    
+
     def _start_work(self, job):
         self.emit(SIGNAL('layoutAboutToBeChanged()'))
         self.jobs.sort()
         self.emit(SIGNAL('layoutChanged()'))
-    
+
     def _job_done(self, job):
         self.emit(SIGNAL('layoutAboutToBeChanged()'))
         self.jobs.sort()
         self.emit(SIGNAL('job_done(int)'), len(self.jobs) - len(self.done_jobs()))
         self.emit(SIGNAL('layoutChanged()'))
-    
+
     def _status_update(self, job):
         try:
             row = self.jobs.index(job)
@@ -134,38 +134,38 @@ class JobManager(QAbstractTableModel):
             return
         self.emit(SIGNAL('dataChanged(QModelIndex, QModelIndex)'),
                   self.index(row, 0), self.index(row, 3))
-        
-    def running_time_updated(self):
+
+    def running_time_updated(self, *args):
         for job in self.jobs:
             if not job.is_running:
                 continue
             row = self.jobs.index(job)
             self.emit(SIGNAL('dataChanged(QModelIndex, QModelIndex)'),
-                      self.index(row, 3), self.index(row, 3))
-            
+                        self.index(row, 3), self.index(row, 3))
+
     def has_device_jobs(self):
         for job in self.jobs:
             if job.is_running and isinstance(job, DeviceJob):
                 return True
         return False
-    
+
     def has_jobs(self):
         for job in self.jobs:
             if job.is_running:
                 return True
         return False
-    
+
     def run_job(self, done, func, args=[], kwargs={},
                            description=None):
         job = ParallelJob(func, done, self, args=args, kwargs=kwargs,
                           description=description)
         self.server.add_job(job)
         return job
-        
-    
+
+
     def output(self, job):
         self.emit(SIGNAL('output_received()'))
-    
+
     def kill_job(self, row, view):
         job = self.jobs[row]
         if isinstance(job, DeviceJob):
@@ -183,20 +183,20 @@ class JobManager(QAbstractTableModel):
 
 
         self.server.kill(job)
-    
+
     def terminate_all_jobs(self):
         pass
-    
+
 class DetailView(QDialog, Ui_Dialog):
-    
+
     def __init__(self, parent, job):
         QDialog.__init__(self, parent)
         self.setupUi(self)
         self.setWindowTitle(job.description)
         self.job = job
         self.update()
-        
-            
+
+
     def update(self):
         self.log.setPlainText(self.job.console_text())
         vbar = self.log.verticalScrollBar()
diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py
index 9f82b3b318..1f3ed31478 100644
--- a/src/calibre/gui2/library.py
+++ b/src/calibre/gui2/library.py
@@ -86,15 +86,15 @@ class LibraryDelegate(QItemDelegate):
         return sb
 
 class DateDelegate(QStyledItemDelegate):
-    
+
     def displayText(self, val, locale):
         d = val.toDate()
         return d.toString('dd MMM yyyy')
-        
+
     def createEditor(self, parent, option, index):
         qde = QStyledItemDelegate.createEditor(self, parent, option, index)
-        qde.setDisplayFormat('MM/dd/yyyy')
-        qde.setMinimumDate(QDate(-4000,1,1))
+        qde.setDisplayFormat(unicode(qde.displayFormat()).replace('yy', 'yyyy'))
+        qde.setMinimumDate(QDate(101,1,1))
         qde.setCalendarPopup(True)
         return qde
 
@@ -103,7 +103,7 @@ class BooksModel(QAbstractTableModel):
     [1000,900,500,400,100,90,50,40,10,9,5,4,1],
     ["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"]
     )
-    
+
     headers = {
                         'title'     : _("Title"),
                         'authors'   : _("Author(s)"),
@@ -114,7 +114,7 @@ class BooksModel(QAbstractTableModel):
                         'tags'      : _("Tags"),
                         'series'    : _("Series"),
                         }
-            
+
     @classmethod
     def roman(cls, num):
         if num <= 0 or num >= 4000 or int(num) != num:
@@ -130,7 +130,7 @@ class BooksModel(QAbstractTableModel):
         QAbstractTableModel.__init__(self, parent)
         self.db = None
         self.column_map = config['column_map']
-        self.editable_cols = ['title', 'authors', 'rating', 'publisher', 
+        self.editable_cols = ['title', 'authors', 'rating', 'publisher',
                               'tags', 'series', 'timestamp']
         self.default_image = QImage(':/images/book.svg')
         self.sorted_on = ('timestamp', Qt.AscendingOrder)
@@ -157,10 +157,10 @@ class BooksModel(QAbstractTableModel):
                 tidx = self.column_map.index('timestamp')
             except ValueError:
                 tidx = -1
-            
+
             self.emit(SIGNAL('columns_sorted(int,int)'), idx, tidx)
-        
-    
+
+
     def set_database(self, db):
         self.db = db
         self.build_data_convertors()
@@ -169,7 +169,7 @@ class BooksModel(QAbstractTableModel):
         rows = self.db.refresh_ids(ids)
         if rows:
             self.refresh_rows(rows, current_row=current_row)
-            
+
     def refresh_rows(self, rows, current_row=-1):
         for row in rows:
             if self.cover_cache:
@@ -191,12 +191,12 @@ class BooksModel(QAbstractTableModel):
                                  add_duplicates=add_duplicates)
         self.count_changed()
         return ret
-        
+
     def add_news(self, path, recipe):
         ret = self.db.add_news(path, recipe)
         self.count_changed()
         return ret
-    
+
     def count_changed(self, *args):
         self.emit(SIGNAL('count_changed(int)'), self.db.count())
 
@@ -208,12 +208,12 @@ class BooksModel(QAbstractTableModel):
                      callback=None):
         rows = [row.row() for row in rows]
         if single_format is None:
-            return self.db.export_to_dir(path, rows, 
-                                         self.sorted_on[0] == 'authors', 
-                                         single_dir=single_dir, 
+            return self.db.export_to_dir(path, rows,
+                                         self.sorted_on[0] == 'authors',
+                                         single_dir=single_dir,
                                          callback=callback)
         else:
-            return self.db.export_single_format_to_dir(path, rows, 
+            return self.db.export_single_format_to_dir(path, rows,
                                                        single_format,
                                                        callback=callback)
 
@@ -225,8 +225,8 @@ class BooksModel(QAbstractTableModel):
         self.count_changed()
         self.clear_caches()
         self.reset()
-        
-        
+
+
     def delete_books_by_id(self, ids):
         for id in ids:
             try:
@@ -263,18 +263,18 @@ class BooksModel(QAbstractTableModel):
             self.clear_caches()
             self.reset()
         self.sorted_on = (self.column_map[col], order)
-        
-    
+
+
     def refresh(self, reset=True):
         try:
             col = self.column_map.index(self.sorted_on[0])
         except:
             col = 0
-        self.db.refresh(field=self.column_map[col], 
+        self.db.refresh(field=self.column_map[col],
                         ascending=self.sorted_on[1]==Qt.AscendingOrder)
         if reset:
             self.reset()
-    
+
     def resort(self, reset=True):
         try:
             col = self.column_map.index(self.sorted_on[0])
@@ -412,14 +412,14 @@ class BooksModel(QAbstractTableModel):
             if format is None:
                 ans.append(format)
             else:
-                f = self.db.format(id, format, index_is_id=True, as_file=True, 
+                f = self.db.format(id, format, index_is_id=True, as_file=True,
                                    mode=mode)
                 ans.append(f)
         return ans
-                     
-            
-    
-    def get_preferred_formats(self, rows, formats, paths=False, 
+
+
+
+    def get_preferred_formats(self, rows, formats, paths=False,
                               set_metadata=False, specific_format=None):
         ans = []
         need_auto = []
@@ -431,7 +431,7 @@ class BooksModel(QAbstractTableModel):
             if not fmts:
                 fmts = ''
             db_formats = set(fmts.lower().split(','))
-            available_formats = set([f.lower() for f in formats]) 
+            available_formats = set([f.lower() for f in formats])
             u = available_formats.intersection(db_formats)
             for f in formats:
                 if f.lower() in u:
@@ -471,7 +471,7 @@ class BooksModel(QAbstractTableModel):
                 data = self.db.cover(row_number)
         except IndexError: # Happens if database has not yet been refreshed
             pass
-        
+
         if not data:
             return self.default_image
         img = QImage()
@@ -481,7 +481,7 @@ class BooksModel(QAbstractTableModel):
         return img
 
     def build_data_convertors(self):
-        
+
         tidx = FIELD_MAP['title']
         aidx = FIELD_MAP['authors']
         sidx = FIELD_MAP['size']
@@ -491,44 +491,44 @@ class BooksModel(QAbstractTableModel):
         srdx = FIELD_MAP['series']
         tgdx = FIELD_MAP['tags']
         siix = FIELD_MAP['series_index']
-        
+
         def authors(r):
             au = self.db.data[r][aidx]
             if au:
                 au = [a.strip().replace('|', ',') for a in au.split(',')]
                 return ' & '.join(au)
-            
+
         def timestamp(r):
             dt = self.db.data[r][tmdx]
             if dt:
                 dt = dt - timedelta(seconds=time.timezone) + timedelta(hours=time.daylight)
                 return QDate(dt.year, dt.month, dt.day)
-        
+
         def rating(r):
             r = self.db.data[r][ridx]
             r = r/2 if r else 0
             return r
-            
+
         def publisher(r):
             pub = self.db.data[r][pidx]
             if pub:
                 return pub
-        
+
         def tags(r):
             tags = self.db.data[r][tgdx]
             if tags:
                 return ', '.join(tags.split(','))
-        
+
         def series(r):
             series = self.db.data[r][srdx]
             if series:
                 return series  + ' [%d]'%self.db.data[r][siix]
-            
+
         def size(r):
             size = self.db.data[r][sidx]
             if size:
                 return '%.1f'%(float(size)/(1024*1024))
-        
+
         self.dc = {
                    'title'    : lambda r : self.db.data[r][tidx],
                    'authors'  : authors,
@@ -537,7 +537,7 @@ class BooksModel(QAbstractTableModel):
                    'rating'   : rating,
                    'publisher': publisher,
                    'tags'     : tags,
-                   'series'   : series,                                                                       
+                   'series'   : series,
                    }
 
     def data(self, index, role):
@@ -575,7 +575,7 @@ class BooksModel(QAbstractTableModel):
             val = int(value.toInt()[0]) if column == 'rating' else \
                   value.toDate() if column == 'timestamp' else \
                   unicode(value.toString())
-            id = self.db.id(row)  
+            id = self.db.id(row)
             if column == 'rating':
                 val = 0 if val < 0 else 5 if val > 5 else val
                 val *= 2
@@ -600,7 +600,7 @@ class BooksModel(QAbstractTableModel):
                                 index, index)
             if column == self.sorted_on[0]:
                 self.resort()
-            
+
         return True
 
 class BooksView(TableView):
@@ -634,17 +634,18 @@ class BooksView(TableView):
         QObject.connect(self.selectionModel(), SIGNAL('currentRowChanged(QModelIndex, QModelIndex)'),
                         self._model.current_changed)
         self.connect(self._model, SIGNAL('columns_sorted(int, int)'), self.columns_sorted, Qt.QueuedConnection)
-        
+
     def columns_sorted(self, rating_col, timestamp_col):
         for i in range(self.model().columnCount(None)):
-            if self.itemDelegateForColumn(i) == self.rating_delegate:
+            if self.itemDelegateForColumn(i) in (self.rating_delegate,
+                    self.timestamp_delegate):
                 self.setItemDelegateForColumn(i, self.itemDelegate())
         if rating_col > -1:
             self.setItemDelegateForColumn(rating_col, self.rating_delegate)
         if timestamp_col > -1:
             self.setItemDelegateForColumn(timestamp_col, self.timestamp_delegate)
-            
-    def set_context_menu(self, edit_metadata, send_to_device, convert, view, 
+
+    def set_context_menu(self, edit_metadata, send_to_device, convert, view,
                          save, open_folder, book_details, similar_menu=None):
         self.setContextMenuPolicy(Qt.DefaultContextMenu)
         self.context_menu = QMenu(self)
@@ -662,18 +663,18 @@ class BooksView(TableView):
             self.context_menu.addAction(book_details)
         if similar_menu is not None:
             self.context_menu.addMenu(similar_menu)
-        
+
     def contextMenuEvent(self, event):
         self.context_menu.popup(event.globalPos())
         event.accept()
-    
+
     def sortByColumn(self, colname, order):
         try:
             idx = self._model.column_map.index(colname)
         except ValueError:
             idx = 0
         TableView.sortByColumn(self, idx, order)
-    
+
     @classmethod
     def paths_from_event(cls, event):
         '''
@@ -712,6 +713,9 @@ class BooksView(TableView):
     def set_editable(self, editable):
         self._model.set_editable(editable)
 
+    def set_editable(self, editable):
+        self._model.set_editable(editable)
+
     def connect_to_search_box(self, sb):
         QObject.connect(sb, SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'),
                         self._model.search)
@@ -739,23 +743,23 @@ class DeviceBooksView(BooksView):
 
     def connect_dirtied_signal(self, slot):
         QObject.connect(self._model, SIGNAL('booklist_dirtied()'), slot)
-        
+
     def sortByColumn(self, col, order):
         TableView.sortByColumn(self, col, order)
-        
+
     def dropEvent(self, *args):
-        error_dialog(self, _('Not allowed'), 
+        error_dialog(self, _('Not allowed'),
         _('Dropping onto a device is not supported. First add the book to the calibre library.')).exec_()
 
 class OnDeviceSearch(SearchQueryParser):
-    
+
     def __init__(self, model):
         SearchQueryParser.__init__(self)
         self.model = model
-        
+
     def universal_set(self):
         return set(range(0, len(self.model.db)))
-    
+
     def get_matches(self, location, query):
         location = location.lower().strip()
         query = query.lower().strip()
@@ -776,7 +780,7 @@ class OnDeviceSearch(SearchQueryParser):
                     matches.add(i)
                     break
         return matches
-        
+
 
 class DeviceBooksModel(BooksModel):
 
@@ -839,10 +843,10 @@ class DeviceBooksModel(BooksModel):
         if reset:
             self.reset()
         self.last_search = text
-    
+
     def resort(self, reset):
         self.sort(self.sorted_on[0], self.sorted_on[1], reset=reset)
-    
+
     def sort(self, col, order, reset=True):
         descending = order != Qt.AscendingOrder
         def strcmp(attr):
@@ -961,7 +965,7 @@ class DeviceBooksModel(BooksModel):
                 return QVariant('Marked for deletion')
             col = index.column()
             if col in [0, 1] or (col == 4 and self.db.supports_tags()):
-                return QVariant("Double click to <b>edit</b> me<br><br>")
+                return QVariant(_("Double click to <b>edit</b> me<br><br>"))
         return NONE
 
     def headerData(self, section, orientation, role):
@@ -1006,6 +1010,10 @@ class DeviceBooksModel(BooksModel):
         self.editable = editable
         
 
+    def set_editable(self, editable):
+        self.editable = editable
+
+
 class SearchBox(QLineEdit):
 
     INTERVAL = 1000 #: Time to wait before emitting search signal
@@ -1068,11 +1076,11 @@ class SearchBox(QLineEdit):
         if not all:
             ans = '[' + ans + ']'
         self.set_search_string(ans)
-        
+
     def search_from_tags(self, tags, all):
         joiner = ' and ' if all else ' or '
         self.set_search_string(joiner.join(tags))
-    
+
     def set_search_string(self, txt):
         self.normalize_state()
         self.setText(txt)
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index f297d1465c..f1f1e674b7 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -1,6 +1,7 @@
 from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+'''The main GUI'''
 import os, sys, textwrap, collections, traceback, time
 from xml.parsers.expat import ExpatError
 from functools import partial
@@ -12,10 +13,8 @@ from PyQt4.Qt import Qt, SIGNAL, QObject, QCoreApplication, QUrl, QTimer, \
 from PyQt4.QtSvg import QSvgRenderer
 
 from calibre import __version__, __appname__, islinux, sanitize_file_name, \
-                    iswindows, isosx, preferred_encoding
+                    iswindows, isosx
 from calibre.ptempfile import PersistentTemporaryFile
-from calibre.devices.errors import FreeSpaceError
-from calibre.devices.interface import Device
 from calibre.utils.config import prefs, dynamic
 from calibre.gui2 import APP_UID, warning_dialog, choose_files, error_dialog, \
                            initialize_file_icon_provider, question_dialog,\
@@ -30,7 +29,7 @@ from calibre.gui2.update import CheckForUpdates
 from calibre.gui2.dialogs.progress import ProgressDialog
 from calibre.gui2.main_window import MainWindow, option_parser as _option_parser
 from calibre.gui2.main_ui import Ui_MainWindow
-from calibre.gui2.device import DeviceManager
+from calibre.gui2.device import DeviceManager, DeviceMenu, DeviceGUI, Emailer
 from calibre.gui2.status import StatusBar
 from calibre.gui2.jobs2 import JobManager
 from calibre.gui2.dialogs.metadata_single import MetadataSingleDialog
@@ -44,14 +43,13 @@ from calibre.gui2.dialogs.config import ConfigDialog
 from calibre.gui2.dialogs.search import SearchDialog
 from calibre.gui2.dialogs.choose_format import ChooseFormatDialog
 from calibre.gui2.dialogs.book_info import BookInfo
-from calibre.ebooks.metadata.meta import set_metadata
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.library.database2 import LibraryDatabase2, CoverCache
 from calibre.parallel import JobKilled
-from calibre.utils.filenames import ascii_filename
 from calibre.gui2.dialogs.confirm_delete import confirm
 
-class Main(MainWindow, Ui_MainWindow):
+class Main(MainWindow, Ui_MainWindow, DeviceGUI):
+    'The main GUI'
 
     def set_default_thumbnail(self, height):
         r = QSvgRenderer(':/images/book.svg')
@@ -60,7 +58,8 @@ class Main(MainWindow, Ui_MainWindow):
         p = QPainter(pixmap)
         r.render(p)
         p.end()
-        self.default_thumbnail = (pixmap.width(), pixmap.height(), pixmap_to_data(pixmap))
+        self.default_thumbnail = (pixmap.width(), pixmap.height(),
+                pixmap_to_data(pixmap))
 
     def __init__(self, single_instance, opts, actions, parent=None):
         self.preferences_action, self.quit_action = actions
@@ -70,7 +69,8 @@ class Main(MainWindow, Ui_MainWindow):
         self.fc = __import__('calibre.utils.fontconfig', fromlist=1)
         self.single_instance = single_instance
         if self.single_instance is not None:
-            self.connect(self.single_instance, SIGNAL('message_received(PyQt_PyObject)'),
+            self.connect(self.single_instance,
+                    SIGNAL('message_received(PyQt_PyObject)'),
                          self.another_instance_wants_to_talk)
 
         Ui_MainWindow.__init__(self)
@@ -80,6 +80,8 @@ class Main(MainWindow, Ui_MainWindow):
         self.get_metadata = GetMetadata()
         self.read_settings()
         self.job_manager = JobManager()
+        self.emailer = Emailer()
+        self.emailer.start()
         self.jobs_dialog = JobsDialog(self, self.job_manager)
         self.upload_memory = {}
         self.delete_memory = {}
@@ -87,7 +89,8 @@ class Main(MainWindow, Ui_MainWindow):
         self.persistent_files = []
         self.metadata_dialogs = []
         self.default_thumbnail = None
-        self.device_error_dialog = ConversionErrorDialog(self, _('Error communicating with device'), ' ')
+        self.device_error_dialog = ConversionErrorDialog(self,
+                _('Error communicating with device'), ' ')
         self.device_error_dialog.setModal(Qt.NonModal)
         self.tb_wrapper = textwrap.TextWrapper(width=40)
         self.device_connected = False
@@ -100,8 +103,10 @@ class Main(MainWindow, Ui_MainWindow):
         else:
             self.system_tray_icon.show()
         self.system_tray_menu = QMenu()
-        self.restore_action = self.system_tray_menu.addAction(QIcon(':/images/page.svg'), _('&Restore'))
-        self.donate_action  = self.system_tray_menu.addAction(QIcon(':/images/donate.svg'), _('&Donate to support calibre'))
+        self.restore_action = self.system_tray_menu.addAction(
+                QIcon(':/images/page.svg'), _('&Restore'))
+        self.donate_action  = self.system_tray_menu.addAction(
+                QIcon(':/images/donate.svg'), _('&Donate to support calibre'))
         self.donate_button.setDefaultAction(self.donate_action)
         self.addAction(self.quit_action)
         self.action_restart = QAction(_('&Restart'), self)
@@ -114,62 +119,52 @@ class Main(MainWindow, Ui_MainWindow):
         self.system_tray_icon.setContextMenu(self.system_tray_menu)
         self.connect(self.quit_action, SIGNAL('triggered(bool)'), self.quit)
         self.connect(self.donate_action, SIGNAL('triggered(bool)'), self.donate)
-        self.connect(self.restore_action, SIGNAL('triggered(bool)'), lambda c : self.show())
-        self.connect(self.action_show_book_details, SIGNAL('triggered(bool)'), self.show_book_info)
-        self.connect(self.action_restart, SIGNAL('triggered(bool)'), 
-                     lambda c : self.quit(None, restart=True))
-        self.connect(self.system_tray_icon, SIGNAL('activated(QSystemTrayIcon::ActivationReason)'), 
-                     self.system_tray_icon_activated)
+        self.connect(self.restore_action, SIGNAL('triggered()'),
+                self.show)
+        self.connect(self.action_show_book_details,
+                SIGNAL('triggered(bool)'), self.show_book_info)
+        self.connect(self.action_restart, SIGNAL('triggered()'),
+                     self.restart)
+        self.connect(self.system_tray_icon,
+                SIGNAL('activated(QSystemTrayIcon::ActivationReason)'),
+                self.system_tray_icon_activated)
         self.tool_bar.contextMenuEvent = self.no_op
         ####################### Location View ########################
-        QObject.connect(self.location_view, SIGNAL('location_selected(PyQt_PyObject)'),
+        QObject.connect(self.location_view,
+                SIGNAL('location_selected(PyQt_PyObject)'),
                         self.location_selected)
-        QObject.connect(self.stack, SIGNAL('currentChanged(int)'),
-                        self.location_view.location_changed)
-        
+
         self.output_formats = sorted(['EPUB', 'MOBI', 'LRF'])
         for f in self.output_formats:
             self.output_format.addItem(f)
-        self.output_format.setCurrentIndex(self.output_formats.index(prefs['output_format']))
-        self.connect(self.output_format, SIGNAL('currentIndexChanged(QString)'), 
+        self.output_format.setCurrentIndex(self.output_formats.index(
+            prefs['output_format']))
+        self.connect(self.output_format, SIGNAL('currentIndexChanged(QString)'),
                      self.change_output_format, Qt.QueuedConnection)
 
         ####################### Vanity ########################
-        self.vanity_template  = _('<p>For help visit <a href="http://%s.kovidgoyal.net/user_manual">%s.kovidgoyal.net</a><br>')%(__appname__, __appname__)
-        self.vanity_template += _('<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>')%(__appname__, __version__)
+        self.vanity_template  = _('<p>For help visit <a href="http://%s.'
+                'kovidgoyal.net/user_manual">%s.kovidgoyal.net</a>'
+                '<br>')%(__appname__, __appname__)
+        self.vanity_template += _('<b>%s</b>: %s by <b>Kovid Goyal '
+            '%%(version)s</b><br>%%(device)s</p>')%(__appname__, __version__)
         self.latest_version = ' '
         self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
         self.device_info = ' '
         self.update_checker = CheckForUpdates()
-        QObject.connect(self.update_checker, SIGNAL('update_found(PyQt_PyObject)'),
-                        self.update_found)
+        QObject.connect(self.update_checker,
+                SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
         self.update_checker.start()
         ####################### Status Bar #####################
         self.status_bar = StatusBar(self.jobs_dialog, self.system_tray_icon)
         self.setStatusBar(self.status_bar)
-        QObject.connect(self.job_manager, SIGNAL('job_added(int)'), self.status_bar.job_added,
-                        Qt.QueuedConnection)
-        QObject.connect(self.job_manager, SIGNAL('job_done(int)'), self.status_bar.job_done,
-                        Qt.QueuedConnection)
-        QObject.connect(self.status_bar, SIGNAL('show_book_info()'), self.show_book_info)
+        QObject.connect(self.job_manager, SIGNAL('job_added(int)'),
+                self.status_bar.job_added, Qt.QueuedConnection)
+        QObject.connect(self.job_manager, SIGNAL('job_done(int)'),
+                self.status_bar.job_done, Qt.QueuedConnection)
+        QObject.connect(self.status_bar, SIGNAL('show_book_info()'),
+                self.show_book_info)
         ####################### Setup Toolbar #####################
-        sm = QMenu()
-        sm.addAction(QIcon(':/images/reader.svg'), _('Send to main memory'))
-        sm.addAction(QIcon(':/images/sd.svg'), _('Send to storage card'))
-        sm.addAction(QIcon(':/images/reader.svg'), _('Send to main memory')+' '+_('and delete from library'))
-        sm.addAction(QIcon(':/images/sd.svg'), _('Send to storage card')+' '+_('and delete from library'))
-        sm.addAction(self.action_send_specific_format_to_device)
-        self.connect(self.action_send_specific_format_to_device, 
-                     SIGNAL('triggered()'), self.send_specific_format_to_device)
-        sm.addSeparator()
-        sm.addAction(_('Send to storage card by default'))
-        sm.actions()[-1].setCheckable(True)
-        QObject.connect(sm.actions()[-1], SIGNAL('toggled(bool)'), 
-                        self.do_default_sync)
-
-        sm.actions()[-1].setChecked(config.get('send_to_storage_card_by_default'))
-        self.do_default_sync(sm.actions()[-1].isChecked())
-        self.sync_menu = sm # Needed
         md = QMenu()
         md.addAction(_('Edit metadata individually'))
         md.addSeparator()
@@ -177,42 +172,60 @@ class Main(MainWindow, Ui_MainWindow):
         self.metadata_menu = md
         self.add_menu = QMenu()
         self.add_menu.addAction(_('Add books from a single directory'))
-        self.add_menu.addAction(_('Add books from directories, including sub-directories (One book per directory, assumes every ebook file is the same book in a different format)'))
-        self.add_menu.addAction(_('Add books from directories, including sub directories (Multiple books per directory, assumes every ebook file is a different book)'))
+        self.add_menu.addAction(_('Add books from directories, including '
+            'sub-directories (One book per directory, assumes every ebook '
+            'file is the same book in a different format)'))
+        self.add_menu.addAction(_('Add books from directories, including '
+            'sub directories (Multiple books per directory, assumes every '
+            'ebook file is a different book)'))
         self.action_add.setMenu(self.add_menu)
-        QObject.connect(self.action_add, SIGNAL("triggered(bool)"), self.add_books)
-        QObject.connect(self.add_menu.actions()[0], SIGNAL("triggered(bool)"), self.add_books)
-        QObject.connect(self.add_menu.actions()[1], SIGNAL("triggered(bool)"), self.add_recursive_single)
-        QObject.connect(self.add_menu.actions()[2], SIGNAL("triggered(bool)"), self.add_recursive_multiple)
-        QObject.connect(self.action_del, SIGNAL("triggered(bool)"), self.delete_books)
-        QObject.connect(self.action_edit, SIGNAL("triggered(bool)"), self.edit_metadata)
-        QObject.connect(md.actions()[0], SIGNAL('triggered(bool)'), partial(self.edit_metadata, bulk=False))
-        QObject.connect(md.actions()[2], SIGNAL('triggered(bool)'), partial(self.edit_metadata, bulk=True))
-        QObject.connect(sm.actions()[0], SIGNAL('triggered(bool)'), self.sync_to_main_memory)
-        QObject.connect(sm.actions()[1], SIGNAL('triggered(bool)'), self.sync_to_card)
-        QObject.connect(sm.actions()[2], SIGNAL('triggered(bool)'), partial(self.sync_to_main_memory, delete_from_library=True))
-        QObject.connect(sm.actions()[3], SIGNAL('triggered(bool)'), partial(self.sync_to_card, delete_from_library=True))
+        QObject.connect(self.action_add, SIGNAL("triggered(bool)"),
+                self.add_books)
+        QObject.connect(self.add_menu.actions()[0], SIGNAL("triggered(bool)"),
+                self.add_books)
+        QObject.connect(self.add_menu.actions()[1], SIGNAL("triggered(bool)"),
+                self.add_recursive_single)
+        QObject.connect(self.add_menu.actions()[2], SIGNAL("triggered(bool)"),
+                self.add_recursive_multiple)
+        QObject.connect(self.action_del, SIGNAL("triggered(bool)"),
+                self.delete_books)
+        QObject.connect(self.action_edit, SIGNAL("triggered(bool)"),
+                self.edit_metadata)
+        QObject.connect(md.actions()[0], SIGNAL('triggered(bool)'),
+                partial(self.edit_metadata, bulk=False))
+        QObject.connect(md.actions()[2], SIGNAL('triggered(bool)'),
+                partial(self.edit_metadata, bulk=True))
         self.save_menu = QMenu()
         self.save_menu.addAction(_('Save to disk'))
         self.save_menu.addAction(_('Save to disk in a single directory'))
-        self.save_menu.addAction(_('Save only %s format to disk')%config.get('save_to_disk_single_format').upper())
-        
+        self.save_menu.addAction(_('Save only %s format to disk')%\
+                config.get('save_to_disk_single_format').upper())
+
         self.view_menu = QMenu()
         self.view_menu.addAction(_('View'))
         self.view_menu.addAction(_('View specific format'))
         self.action_view.setMenu(self.view_menu)
-        QObject.connect(self.action_save, SIGNAL("triggered(bool)"), self.save_to_disk)
-        QObject.connect(self.save_menu.actions()[0], SIGNAL("triggered(bool)"), self.save_to_disk)
-        QObject.connect(self.save_menu.actions()[1], SIGNAL("triggered(bool)"), self.save_to_single_dir)
-        QObject.connect(self.save_menu.actions()[2], SIGNAL("triggered(bool)"), self.save_single_format_to_disk)
-        QObject.connect(self.action_view, SIGNAL("triggered(bool)"), self.view_book)
-        QObject.connect(self.view_menu.actions()[0], SIGNAL("triggered(bool)"), self.view_book)
-        QObject.connect(self.view_menu.actions()[1], SIGNAL("triggered(bool)"), self.view_specific_format)
-        self.connect(self.action_open_containing_folder, SIGNAL('triggered(bool)'), self.view_folder)
+        QObject.connect(self.action_save, SIGNAL("triggered(bool)"),
+                self.save_to_disk)
+        QObject.connect(self.save_menu.actions()[0], SIGNAL("triggered(bool)"),
+                self.save_to_disk)
+        QObject.connect(self.save_menu.actions()[1], SIGNAL("triggered(bool)"),
+                self.save_to_single_dir)
+        QObject.connect(self.save_menu.actions()[2], SIGNAL("triggered(bool)"),
+                self.save_single_format_to_disk)
+        QObject.connect(self.action_view, SIGNAL("triggered(bool)"),
+                self.view_book)
+        QObject.connect(self.view_menu.actions()[0],
+                SIGNAL("triggered(bool)"), self.view_book)
+        QObject.connect(self.view_menu.actions()[1],
+                SIGNAL("triggered(bool)"), self.view_specific_format)
+        self.connect(self.action_open_containing_folder,
+                SIGNAL('triggered(bool)'), self.view_folder)
         self.action_open_containing_folder.setShortcut(Qt.Key_O)
         self.addAction(self.action_open_containing_folder)
         self.action_sync.setShortcut(Qt.Key_D)
-        self.action_sync.setMenu(sm)
+        self.action_sync.setEnabled(True)
+        self.create_device_menu()
         self.action_edit.setMenu(md)
         self.action_save.setMenu(self.save_menu)
         cm = QMenu()
@@ -222,26 +235,42 @@ class Main(MainWindow, Ui_MainWindow):
         cm.addAction(_('Set defaults for conversion'))
         cm.addAction(_('Set defaults for conversion of comics'))
         self.action_convert.setMenu(cm)
-        QObject.connect(cm.actions()[0], SIGNAL('triggered(bool)'), self.convert_single)
-        QObject.connect(cm.actions()[1], SIGNAL('triggered(bool)'), self.convert_bulk)
-        QObject.connect(cm.actions()[3], SIGNAL('triggered(bool)'), self.set_conversion_defaults)
-        QObject.connect(cm.actions()[4], SIGNAL('triggered(bool)'), self.set_comic_conversion_defaults)
-        QObject.connect(self.action_convert, SIGNAL('triggered(bool)'), self.convert_single)
+        QObject.connect(cm.actions()[0],
+                SIGNAL('triggered(bool)'), self.convert_single)
+        QObject.connect(cm.actions()[1],
+                SIGNAL('triggered(bool)'), self.convert_bulk)
+        QObject.connect(cm.actions()[3],
+                SIGNAL('triggered(bool)'), self.set_conversion_defaults)
+        QObject.connect(cm.actions()[4],
+                SIGNAL('triggered(bool)'), self.set_comic_conversion_defaults)
+        QObject.connect(self.action_convert,
+                SIGNAL('triggered(bool)'), self.convert_single)
         self.convert_menu = cm
-        self.tool_bar.widgetForAction(self.action_news).setPopupMode(QToolButton.MenuButtonPopup)
-        self.tool_bar.widgetForAction(self.action_edit).setPopupMode(QToolButton.MenuButtonPopup)
-        self.tool_bar.widgetForAction(self.action_sync).setPopupMode(QToolButton.MenuButtonPopup)
-        self.tool_bar.widgetForAction(self.action_convert).setPopupMode(QToolButton.MenuButtonPopup)
-        self.tool_bar.widgetForAction(self.action_save).setPopupMode(QToolButton.MenuButtonPopup)
-        self.tool_bar.widgetForAction(self.action_add).setPopupMode(QToolButton.MenuButtonPopup)
-        self.tool_bar.widgetForAction(self.action_view).setPopupMode(QToolButton.MenuButtonPopup)
+        self.tool_bar.widgetForAction(self.action_news).\
+                setPopupMode(QToolButton.MenuButtonPopup)
+        self.tool_bar.widgetForAction(self.action_edit).\
+                setPopupMode(QToolButton.MenuButtonPopup)
+        self.tool_bar.widgetForAction(self.action_sync).\
+                setPopupMode(QToolButton.MenuButtonPopup)
+        self.tool_bar.widgetForAction(self.action_convert).\
+                setPopupMode(QToolButton.MenuButtonPopup)
+        self.tool_bar.widgetForAction(self.action_save).\
+                setPopupMode(QToolButton.MenuButtonPopup)
+        self.tool_bar.widgetForAction(self.action_add).\
+                setPopupMode(QToolButton.MenuButtonPopup)
+        self.tool_bar.widgetForAction(self.action_view).\
+                setPopupMode(QToolButton.MenuButtonPopup)
         self.tool_bar.setContextMenuPolicy(Qt.PreventContextMenu)
 
-        QObject.connect(self.config_button, SIGNAL('clicked(bool)'), self.do_config)
-        self.connect(self.preferences_action, SIGNAL('triggered(bool)'), self.do_config)
-        self.connect(self.action_preferences, SIGNAL('triggered(bool)'), self.do_config)
-        QObject.connect(self.advanced_search_button, SIGNAL('clicked(bool)'), self.do_advanced_search)
-        
+        QObject.connect(self.config_button,
+                SIGNAL('clicked(bool)'), self.do_config)
+        self.connect(self.preferences_action, SIGNAL('triggered(bool)'),
+                self.do_config)
+        self.connect(self.action_preferences, SIGNAL('triggered(bool)'),
+                self.do_config)
+        QObject.connect(self.advanced_search_button, SIGNAL('clicked(bool)'),
+                self.do_advanced_search)
+
         ####################### Library view ########################
         similar_menu = QMenu(_('Similar books...'))
         similar_menu.addAction(self.action_books_by_same_author)
@@ -261,22 +290,28 @@ class Main(MainWindow, Ui_MainWindow):
                      lambda : self.show_similar_books('author'))
         self.connect(self.action_books_in_this_series, SIGNAL('triggered()'),
                      lambda : self.show_similar_books('series'))
-        self.connect(self.action_books_with_the_same_tags, SIGNAL('triggered()'),
+        self.connect(self.action_books_with_the_same_tags,
+                     SIGNAL('triggered()'),
                      lambda : self.show_similar_books('tag'))
         self.connect(self.action_books_by_this_publisher, SIGNAL('triggered()'),
                      lambda : self.show_similar_books('publisher'))
-        self.library_view.set_context_menu(self.action_edit, self.action_sync, 
-                                           self.action_convert, self.action_view, 
-                                           self.action_save, self.action_open_containing_folder,
-                                           self.action_show_book_details,
-                                           similar_menu=similar_menu)
-        self.memory_view.set_context_menu(None, None, None, self.action_view, self.action_save, None, None)
-        self.card_view.set_context_menu(None, None, None, self.action_view, self.action_save, None, None)
-        QObject.connect(self.library_view, SIGNAL('files_dropped(PyQt_PyObject)'),
+        self.library_view.set_context_menu(self.action_edit, self.action_sync,
+                                        self.action_convert, self.action_view,
+                                        self.action_save,
+                                        self.action_open_containing_folder,
+                                        self.action_show_book_details,
+                                        similar_menu=similar_menu)
+        self.memory_view.set_context_menu(None, None, None,
+                self.action_view, self.action_save, None, None)
+        self.card_view.set_context_menu(None, None, None,
+                self.action_view, self.action_save, None, None)
+        QObject.connect(self.library_view,
+                SIGNAL('files_dropped(PyQt_PyObject)'),
                         self.files_dropped)
         for func, target in [
                              ('connect_to_search_box', self.search),
-                             ('connect_to_book_display', self.status_bar.book_info.show_data),
+                             ('connect_to_book_display',
+                                 self.status_bar.book_info.show_data),
                              ]:
             for view in (self.library_view, self.memory_view, self.card_view):
                 getattr(view, func)(target)
@@ -291,9 +326,11 @@ class Main(MainWindow, Ui_MainWindow):
         try:
             db = LibraryDatabase2(self.library_path)
         except Exception, err:
-            error_dialog(self, _('Bad database location'), unicode(err)).exec_()
+            error_dialog(self, _('Bad database location'),
+                    unicode(err)).exec_()
             dir = unicode(QFileDialog.getExistingDirectory(self,
-                            _('Choose a location for your ebook library.'), os.path.expanduser('~')))
+                            _('Choose a location for your ebook library.'),
+                            os.path.expanduser('~')))
             if not dir:
                 QCoreApplication.exit(1)
             else:
@@ -301,7 +338,8 @@ class Main(MainWindow, Ui_MainWindow):
                 db = LibraryDatabase2(self.library_path)
         self.library_view.set_database(db)
         prefs['library_path'] = self.library_path
-        self.library_view.sortByColumn(*dynamic.get('sort_column', ('timestamp', Qt.DescendingOrder)))
+        self.library_view.sortByColumn(*dynamic.get('sort_column',
+            ('timestamp', Qt.DescendingOrder)))
         if not self.library_view.restore_column_widths():
             self.library_view.resizeColumnsToContents()
         self.library_view.resizeRowsToContents()
@@ -314,12 +352,16 @@ class Main(MainWindow, Ui_MainWindow):
         self.match_any.setVisible(False)
         self.popularity.setVisible(False)
         self.tags_view.set_database(db, self.match_all, self.popularity)
-        self.connect(self.tags_view, SIGNAL('tags_marked(PyQt_PyObject, PyQt_PyObject)'),
+        self.connect(self.tags_view,
+                SIGNAL('tags_marked(PyQt_PyObject, PyQt_PyObject)'),
                      self.search.search_from_tags)
-        self.connect(self.status_bar.tag_view_button, SIGNAL('toggled(bool)'), self.toggle_tags_view)
-        self.connect(self.search, SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'),
+        self.connect(self.status_bar.tag_view_button,
+                SIGNAL('toggled(bool)'), self.toggle_tags_view)
+        self.connect(self.search,
+                SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'),
                      self.tags_view.model().reinit)
-        self.connect(self.library_view.model(), SIGNAL('count_changed(int)'), self.location_view.count_changed)
+        self.connect(self.library_view.model(),
+                SIGNAL('count_changed(int)'), self.location_view.count_changed)
         self.connect(self.library_view.model(), SIGNAL('count_changed(int)'),
                      self.tags_view.recount)
         self.library_view.model().count_changed()
@@ -336,16 +378,16 @@ class Main(MainWindow, Ui_MainWindow):
             self.cover_flow.setVisible(False)
             if not config['separate_cover_flow']:
                 self.library.layout().addWidget(self.cover_flow)
-            self.connect(self.cover_flow, SIGNAL('currentChanged(int)'), 
+            self.connect(self.cover_flow, SIGNAL('currentChanged(int)'),
                          self.sync_cf_to_listview)
-            self.connect(self.cover_flow, SIGNAL('itemActivated(int)'), 
+            self.connect(self.cover_flow, SIGNAL('itemActivated(int)'),
                          self.show_book_info)
-            self.connect(self.status_bar.cover_flow_button, 
+            self.connect(self.status_bar.cover_flow_button,
                          SIGNAL('toggled(bool)'), self.toggle_cover_flow)
-            self.connect(self.cover_flow, SIGNAL('stop()'), 
+            self.connect(self.cover_flow, SIGNAL('stop()'),
                          self.status_bar.cover_flow_button.toggle)
-            QObject.connect(self.library_view.selectionModel(), 
-                            SIGNAL('currentRowChanged(QModelIndex, QModelIndex)'),
+            QObject.connect(self.library_view.selectionModel(),
+                        SIGNAL('currentRowChanged(QModelIndex, QModelIndex)'),
                             self.sync_cf_to_listview)
             self.db_images = DatabaseImages(self.library_view.model())
             self.cover_flow.setImages(self.db_images)
@@ -356,30 +398,45 @@ class Main(MainWindow, Ui_MainWindow):
         self.setMaximumHeight(max_available_height())
 
         ####################### Setup device detection ########################
-        self.device_manager = DeviceManager(Dispatcher(self.device_detected), self.job_manager)
+        self.device_manager = DeviceManager(Dispatcher(self.device_detected),
+                self.job_manager)
         self.device_manager.start()
-        
-        
+
+
         if config['autolaunch_server']:
             from calibre.library.server import start_threaded_server
             from calibre.library import server_config
-            self.content_server = start_threaded_server(db, server_config().parse())
+            self.content_server = start_threaded_server(
+                    db, server_config().parse())
             self.test_server_timer = QTimer.singleShot(10000, self.test_server)
-        
-        
+
+
         self.scheduler = Scheduler(self)
         self.action_news.setMenu(self.scheduler.news_menu)
-        self.connect(self.action_news, SIGNAL('triggered(bool)'), self.scheduler.show_dialog)
+        self.connect(self.action_news, SIGNAL('triggered(bool)'),
+                self.scheduler.show_dialog)
         self.location_view.setCurrentIndex(self.location_view.model().index(0))
-    
+
+    def create_device_menu(self):
+        self._sync_menu = DeviceMenu(self)
+        self.action_sync.setMenu(self._sync_menu)
+        self.connect(self._sync_menu,
+                SIGNAL('sync(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)'),
+                self.dispatch_sync_event)
+        self.connect(self.action_sync, SIGNAL('triggered(bool)'),
+                self._sync_menu.trigger_default)
+
+
+
     def no_op(self, *args):
         pass
-    
+
     def system_tray_icon_activated(self, r):
         if r == QSystemTrayIcon.Trigger:
             if self.isVisible():
                 for window in QApplication.topLevelWidgets():
-                    if isinstance(window, (MainWindow, QDialog)) and window.isVisible():
+                    if isinstance(window, (MainWindow, QDialog)) and \
+                            window.isVisible():
                         window.hide()
                         setattr(window, '__systray_minimized', True)
             else:
@@ -387,29 +444,22 @@ class Main(MainWindow, Ui_MainWindow):
                     if getattr(window, '__systray_minimized', False):
                         window.show()
                         setattr(window, '__systray_minimized', False)
-                         
-    
-    def do_default_sync(self, checked):
-        config.set('send_to_storage_card_by_default', bool(checked))
-        QObject.disconnect(self.action_sync, SIGNAL("triggered(bool)"), 
-                           self.sync_to_main_memory)
-        QObject.disconnect(self.action_sync, SIGNAL("triggered(bool)"), 
-                           self.sync_to_card)
-        QObject.connect(self.action_sync, SIGNAL("triggered(bool)"), 
-                        self.sync_to_card if checked else self.sync_to_main_memory)
-    
+
+
     def change_output_format(self, x):
         of = unicode(x).strip()
         if of != prefs['output_format']:
             if of not in ('LRF', 'EPUB', 'MOBI'):
-                warning_dialog(self, 'Warning', 
-                               '<p>%s support is still in beta. If you find bugs, please report them by opening a <a href="http://calibre.kovidgoyal.net">ticket</a>.'%of).exec_()
+                warning_dialog(self, 'Warning',
+                    ('<p>%s support is still in beta. If you find bugs, '
+                    'please report them by opening a <a href="http://cal'
+                    'ibre.kovidgoyal.net">ticket</a>.')%of).exec_()
             prefs.set('output_format', of)
-        
-        
+
+
     def test_server(self, *args):
         if self.content_server.exception is not None:
-            error_dialog(self, _('Failed to start content server'), 
+            error_dialog(self, _('Failed to start content server'),
                          unicode(self.content_server.exception)).exec_()
 
     def show_similar_books(self, type):
@@ -433,13 +483,17 @@ class Main(MainWindow, Ui_MainWindow):
         elif type == 'author':
             authors = idx.model().db.authors(row)
             if authors:
-                search = ['author:'+a.strip().replace('|', ',') for a in authors.split(',')]
+                search = ['author:'+a.strip().replace('|', ',') \
+                                for a in authors.split(',')]
                 join = ' or '
         if search:
             self.search.set_search_string(join.join(search))
-            
-                
-    
+
+
+
+    def uncheck_cover_button(self, *args):
+        self.status_bar.cover_flow_button.setChecked(False)
+
     def toggle_cover_flow(self, show):
         if config['separate_cover_flow']:
             if show:
@@ -454,8 +508,8 @@ class Main(MainWindow, Ui_MainWindow):
                 self.cover_flow.setFocus(Qt.OtherFocusReason)
                 self.library_view.scrollTo(self.library_view.currentIndex())
                 d.show()
-                self.connect(d, SIGNAL('finished(int)'), 
-                             lambda x: self.status_bar.cover_flow_button.setChecked(False))
+                self.connect(d, SIGNAL('finished(int)'),
+                    self.uncheck_cover_button)
                 self.cf_dialog = d
             else:
                 cfd = getattr(self, 'cf_dialog', None)
@@ -465,7 +519,8 @@ class Main(MainWindow, Ui_MainWindow):
                     self.cf_dialog = None
         else:
             if show:
-                self.library_view.setCurrentIndex(self.library_view.currentIndex())
+                self.library_view.setCurrentIndex(
+                        self.library_view.currentIndex())
                 self.cover_flow.setVisible(True)
                 self.cover_flow.setFocus(Qt.OtherFocusReason)
                 #self.status_bar.book_info.book_data.setMaximumHeight(100)
@@ -490,7 +545,8 @@ class Main(MainWindow, Ui_MainWindow):
             self.popularity.setVisible(False)
 
     def sync_cf_to_listview(self, index, *args):
-        if not hasattr(index, 'row') and self.library_view.currentIndex().row() != index:
+        if not hasattr(index, 'row') and \
+                self.library_view.currentIndex().row() != index:
             index = self.library_view.model().index(index, 0)
             self.library_view.setCurrentIndex(index)
         if hasattr(index, 'row') and self.cover_flow.isVisible() and \
@@ -504,7 +560,8 @@ class Main(MainWindow, Ui_MainWindow):
                 path = os.path.abspath(argv[1])
                 if os.access(path, os.R_OK):
                     self.add_filesystem_book(path)
-            self.setWindowState(self.windowState() & ~Qt.WindowMinimized|Qt.WindowActive)
+            self.setWindowState(self.windowState() & \
+                    ~Qt.WindowMinimized|Qt.WindowActive)
             self.show()
             self.raise_()
             self.activateWindow()
@@ -536,22 +593,26 @@ class Main(MainWindow, Ui_MainWindow):
         Called when a device is connected to the computer.
         '''
         if connected:
-            self.device_manager.get_device_information(Dispatcher(self.info_read))
-            self.set_default_thumbnail(self.device_manager.device.THUMBNAIL_HEIGHT)
+            self.device_manager.get_device_information(\
+                    Dispatcher(self.info_read))
+            self.set_default_thumbnail(\
+                    self.device_manager.device.THUMBNAIL_HEIGHT)
             self.status_bar.showMessage(_('Device: ')+\
-                self.device_manager.device.__class__.__name__+_(' detected.'), 3000)
-            self.action_sync.setEnabled(True)
+                self.device_manager.device.__class__.__name__+\
+                        _(' detected.'), 3000)
             self.device_connected = True
+            self._sync_menu.enable_device_actions(True)
         else:
             self.device_connected = False
+            self._sync_menu.enable_device_actions(False)
             self.location_view.model().update_devices()
-            self.action_sync.setEnabled(False)
-            self.vanity.setText(self.vanity_template%dict(version=self.latest_version, device=' '))
+            self.vanity.setText(self.vanity_template%\
+                    dict(version=self.latest_version, device=' '))
             self.device_info = ' '
             if self.current_view() != self.library_view:
                 self.status_bar.reset_info()
                 self.location_selected('library')
-            
+
     def info_read(self, job):
         '''
         Called once device information has been read.
@@ -562,10 +623,11 @@ class Main(MainWindow, Ui_MainWindow):
         info, cp, fs = job.result
         self.location_view.model().update_devices(cp, fs)
         self.device_info = _('Connected ')+info[0]
-        self.vanity.setText(self.vanity_template%dict(version=self.latest_version, device=self.device_info))
+        self.vanity.setText(self.vanity_template%\
+                dict(version=self.latest_version, device=self.device_info))
 
         self.device_manager.books(Dispatcher(self.metadata_downloaded))
-        
+
     def metadata_downloaded(self, job):
         '''
         Called once metadata has been read for all books on the device.
@@ -598,41 +660,22 @@ class Main(MainWindow, Ui_MainWindow):
     ############################################################################
 
 
-    ############################# Upload booklists #############################
-    def upload_booklists(self):
-        '''
-        Upload metadata to device.
-        '''
-        self.device_manager.sync_booklists(Dispatcher(self.metadata_synced),
-                                           self.booklists())
-    
-    def metadata_synced(self, job):
-        '''
-        Called once metadata has been uploaded.
-        '''
-        if job.exception is not None:
-            self.device_job_exception(job)
-            return
-        cp, fs = job.result
-        self.location_view.model().update_devices(cp, fs)
-    ############################################################################
-
 
     ################################# Add books ################################
 
     def add_recursive(self, single):
-        root = choose_dir(self, 'recursive book import root dir dialog', 
+        root = choose_dir(self, 'recursive book import root dir dialog',
                           'Select root folder')
         if not root:
             return
         from calibre.gui2.add import AddRecursive
-        self._add_recursive_thread = AddRecursive(root, 
+        self._add_recursive_thread = AddRecursive(root,
                                 self.library_view.model().db, self.get_metadata,
                                 single, self)
         self.connect(self._add_recursive_thread, SIGNAL('finished()'),
                      self._recursive_files_added)
         self._add_recursive_thread.start()
-    
+
     def _recursive_files_added(self):
         self._add_recursive_thread.process_duplicates()
         if self._add_recursive_thread.number_of_books_added > 0:
@@ -640,7 +683,7 @@ class Main(MainWindow, Ui_MainWindow):
             self.library_view.model().research()
             self.library_view.model().count_changed()
         self._add_recursive_thread = None
-        
+
     def add_recursive_single(self, checked):
         '''
         Add books from the local filesystem to either the library or the device
@@ -666,7 +709,8 @@ class Main(MainWindow, Ui_MainWindow):
             to_device = self.stack.currentIndex() != 0
             self._add_books(books, to_device)
             if to_device:
-                self.status_bar.showMessage(_('Uploading books to device.'), 2000)
+                self.status_bar.showMessage(\
+                        _('Uploading books to device.'), 2000)
 
     def add_books(self, checked):
         '''
@@ -674,22 +718,22 @@ class Main(MainWindow, Ui_MainWindow):
         '''
         books = choose_files(self, 'add books dialog dir', 'Select books',
                              filters=[
-                                      (_('Books'), BOOK_EXTENSIONS),
-                                      (_('EPUB Books'), ['epub']),
-                                      (_('LRF Books'), ['lrf']),
-                                      (_('HTML Books'), ['htm', 'html', 'xhtm', 'xhtml']),
-                                      (_('LIT Books'), ['lit']),
-                                      (_('MOBI Books'), ['mobi', 'prc']),
-                                      (_('Text books'), ['txt', 'rtf']),
-                                      (_('PDF Books'), ['pdf']),
-                                      (_('Comics'), ['cbz', 'cbr']),
-                                      (_('Archives'), ['zip', 'rar']),
-                                      ])
+                        (_('Books'), BOOK_EXTENSIONS),
+                        (_('EPUB Books'), ['epub']),
+                        (_('LRF Books'), ['lrf']),
+                        (_('HTML Books'), ['htm', 'html', 'xhtm', 'xhtml']),
+                        (_('LIT Books'), ['lit']),
+                        (_('MOBI Books'), ['mobi', 'prc']),
+                        (_('Text books'), ['txt', 'rtf']),
+                        (_('PDF Books'), ['pdf']),
+                        (_('Comics'), ['cbz', 'cbr']),
+                        (_('Archives'), ['zip', 'rar']),
+                        ])
         if not books:
             return
         to_device = self.stack.currentIndex() != 0
         self._add_books(books, to_device)
-        
+
 
     def _add_books(self, paths, to_device, on_card=None):
         if on_card is None:
@@ -697,7 +741,7 @@ class Main(MainWindow, Ui_MainWindow):
         if not paths:
             return
         from calibre.gui2.add import AddFiles
-        self._add_files_thread = AddFiles(paths, self.default_thumbnail, 
+        self._add_files_thread = AddFiles(paths, self.default_thumbnail,
                                           self.get_metadata,
                                           None if to_device else \
                                           self.library_view.model().db
@@ -709,63 +753,23 @@ class Main(MainWindow, Ui_MainWindow):
         self.connect(self._add_files_thread, SIGNAL('finished()'),
                      self._files_added)
         self._add_files_thread.start()
-    
+
     def _files_added(self):
         t = self._add_files_thread
         self._add_files_thread = None
         if not t.canceled:
             if t.send_to_device:
-                self.upload_books(t.paths, 
-                                  list(map(sanitize_file_name, t.names)), 
+                self.upload_books(t.paths,
+                                  list(map(sanitize_file_name, t.names)),
                                   t.infos, on_card=t.on_card)
-                self.status_bar.showMessage(_('Uploading books to device.'), 2000)
+                self.status_bar.showMessage(
+                        _('Uploading books to device.'), 2000)
             else:
                 t.process_duplicates()
         if t.number_of_books_added > 0:
             self.library_view.model().books_added(t.number_of_books_added)
-            self.db_images.reset()
-        
-    def upload_books(self, files, names, metadata, on_card=False, memory=None):
-        '''
-        Upload books to device.
-        :param files: List of either paths to files or file like objects
-        '''
-        titles = [i['title'] for i in metadata]
-        job = self.device_manager.upload_books(Dispatcher(self.books_uploaded),
-                                        files, names, on_card=on_card, 
-                                        metadata=metadata, titles=titles
-                                        )
-        self.upload_memory[job] = (metadata, on_card, memory, files)
-    
-    def books_uploaded(self, job):
-        '''
-        Called once books have been uploaded.
-        '''
-        metadata, on_card, memory, files = self.upload_memory.pop(job)
-        
-        if job.exception is not None:
-            if isinstance(job.exception, FreeSpaceError):
-                where = 'in main memory.' if 'memory' in str(job.exception) else 'on the storage card.'
-                titles = '\n'.join(['<li>'+mi['title']+'</li>' for mi in metadata])
-                d = error_dialog(self, _('No space on device'),
-                                 _('<p>Cannot upload books to device there is no more free space available ')+where+
-                                 '</p>\n<ul>%s</ul>'%(titles,))
-                d.exec_()
-            else:
-                self.device_job_exception(job)
-            return
-        
-        self.device_manager.add_books_to_metadata(job.result, metadata, self.booklists())
-        
-        self.upload_booklists()
-
-        view = self.card_view if on_card else self.memory_view
-        view.model().resort(reset=False)
-        view.model().research()
-        for f in files:
-            getattr(f, 'close', lambda : True)()
-        if memory and memory[1]:
-            self.library_view.model().delete_books_by_id(memory[1])
+            if hasattr(self, 'db_images'):
+                self.db_images.reset()
 
 
     ############################################################################
@@ -787,7 +791,8 @@ class Main(MainWindow, Ui_MainWindow):
                 return
             view.model().delete_books(rows)
         else:
-            view = self.memory_view if self.stack.currentIndex() == 1 else self.card_view
+            view = self.memory_view if self.stack.currentIndex() == 1 \
+                    else self.card_view
             paths = view.model().paths(rows)
             job = self.remove_paths(paths)
             self.delete_memory[job] = (paths, view.model())
@@ -795,8 +800,9 @@ class Main(MainWindow, Ui_MainWindow):
             self.status_bar.showMessage(_('Deleting books from device.'), 1000)
 
     def remove_paths(self, paths):
-        return self.device_manager.delete_books(Dispatcher(self.books_deleted), paths)
-            
+        return self.device_manager.delete_books(\
+                Dispatcher(self.books_deleted), paths)
+
     def books_deleted(self, job):
         '''
         Called once deletion is done on the device
@@ -804,12 +810,13 @@ class Main(MainWindow, Ui_MainWindow):
         for view in (self.memory_view, self.card_view):
             view.model().deletion_done(job, bool(job.exception))
         if job.exception is not None:
-            self.device_job_exception(job)            
+            self.device_job_exception(job)
             return
-        
+
         if self.delete_memory.has_key(job):
             paths, model = self.delete_memory.pop(job)
-            self.device_manager.remove_books_from_metadata(paths, self.booklists())
+            self.device_manager.remove_books_from_metadata(paths,
+                    self.booklists())
             model.paths_deleted(paths)
             self.upload_booklists()
 
@@ -823,14 +830,14 @@ class Main(MainWindow, Ui_MainWindow):
         rows = self.library_view.selectionModel().selectedRows()
         previous = self.library_view.currentIndex()
         if not rows or len(rows) == 0:
-            d = error_dialog(self, _('Cannot edit metadata'), 
+            d = error_dialog(self, _('Cannot edit metadata'),
                              _('No books selected'))
             d.exec_()
             return
 
         if bulk or (bulk is None and len(rows) > 1):
             return self.edit_bulk_metadata(checked)
-        
+
         def accepted(id):
             self.library_view.model().refresh_ids([id])
 
@@ -842,167 +849,45 @@ class Main(MainWindow, Ui_MainWindow):
         if rows:
             current = self.library_view.currentIndex()
             self.library_view.model().current_changed(current, previous)
-            
+
     def edit_bulk_metadata(self, checked):
         '''
         Edit metadata of selected books in library in bulk.
         '''
-        rows = [r.row() for r in self.library_view.selectionModel().selectedRows()]
+        rows = [r.row() for r in \
+                self.library_view.selectionModel().selectedRows()]
         if not rows or len(rows) == 0:
-            d = error_dialog(self, _('Cannot edit metadata'), _('No books selected'))
+            d = error_dialog(self, _('Cannot edit metadata'),
+                    _('No books selected'))
             d.exec_()
             return
-        if MetadataBulkDialog(self, rows, self.library_view.model().db).changed:
+        if MetadataBulkDialog(self, rows,
+                self.library_view.model().db).changed:
             self.library_view.model().resort(reset=False)
             self.library_view.model().research()
 
     ############################################################################
 
-    ############################# Syncing to device#############################
-    def sync_to_main_memory(self, checked, delete_from_library=False):
-        self.sync_to_device(False, delete_from_library)
-
-    def sync_to_card(self, checked, delete_from_library=False):
-        self.sync_to_device(True, delete_from_library)
-
-    def cover_to_thumbnail(self, data):
-        p = QPixmap()
-        p.loadFromData(data)
-        if not p.isNull():
-            ht = self.device_manager.device_class.THUMBNAIL_HEIGHT if self.device_manager else \
-                       Device.THUMBNAIL_HEIGHT
-            p = p.scaledToHeight(ht, Qt.SmoothTransformation)
-            return (p.width(), p.height(), pixmap_to_data(p))
-
-    def sync_news(self):
-        if self.device_connected:
-            ids = list(dynamic.get('news_to_be_synced', set([])))
-            ids = [id for id in ids if self.library_view.model().db.has_id(id)]
-            files = self.library_view.model().get_preferred_formats_from_ids(
-                                ids, self.device_manager.device_class.FORMATS)
-            files = [f for f in files if f is not None]
-            if not files:
-                dynamic.set('news_to_be_synced', set([]))
-                return
-            metadata = self.library_view.model().get_metadata(ids, rows_are_ids=True)
-            names = []
-            for mi in metadata: 
-                prefix = sanitize_file_name(mi['title'])
-                if not isinstance(prefix, unicode):
-                    prefix = prefix.decode(preferred_encoding, 'replace')
-                prefix = ascii_filename(prefix)
-                names.append('%s_%d%s'%(prefix, id, os.path.splitext(f.name)[1]))
-                cdata = mi['cover']
-                if cdata:
-                    mi['cover'] = self.cover_to_thumbnail(cdata)
-            dynamic.set('news_to_be_synced', set([]))
-            if config['upload_news_to_device'] and files:
-                remove = ids if config['delete_news_from_library_on_upload'] else []
-                on_card = self.location_view.model().free[0] < self.location_view.model().free[1]
-                self.upload_books(files, names, metadata, on_card=on_card, memory=[[f.name for f in files], remove])
-                self.status_bar.showMessage(_('Sending news to device.'), 5000)
-                
-    def send_specific_format_to_device(self):
-        d = ChooseFormatDialog(self, _('Choose format to send to device'), 
-                               self.device_manager.device_class.FORMATS)
-        d.exec_()
-        fmt = d.format().lower()
-        on_card = config['send_to_storage_card_by_default']
-        self.sync_to_device(on_card, False, specific_format=fmt)
-        
-    def sync_to_device(self, on_card, delete_from_library, specific_format=None, send_rows=None, auto_convert=True):
-        rows = self.library_view.selectionModel().selectedRows() if send_rows is None else send_rows
-        if not self.device_manager or not rows or len(rows) == 0:
-            return
-        ids = iter(self.library_view.model().id(r) for r in rows)
-        metadata, full_metadata = self.library_view.model().get_metadata(
-                                                    rows, full_metadata=True)
-        for mi in metadata:
-            cdata = mi['cover']
-            if cdata:
-                mi['cover'] = self.cover_to_thumbnail(cdata)
-        metadata, full_metadata = iter(metadata), iter(full_metadata)
-        _files, _auto_rows   = self.library_view.model().get_preferred_formats(rows,
-                                    self.device_manager.device_class.FORMATS, 
-                                    paths=True, set_metadata=True,
-                                    specific_format=specific_format)
-        files = [getattr(f, 'name', None) for f in _files]
-        bad, good, gf, names, remove_ids = [], [], [], [], []
-        for f in files:
-            mi, smi = metadata.next(), full_metadata.next()
-            id = ids.next()
-            if f is None:
-                bad.append(mi['title'])
-            else:
-                remove_ids.append(id)
-                try:
-                    with open(f, 'r+b') as _f:
-                        set_metadata(_f, smi, f.rpartition('.')[2])
-                except:
-                    print 'Error setting metadata in book:', mi['title']
-                    traceback.print_exc()
-                good.append(mi)
-                gf.append(f)
-                t = mi['title']
-                if not t:
-                    t = _('Unknown')
-                a = mi['authors']
-                if not a:
-                    a = _('Unknown')
-                prefix = sanitize_file_name(t+' - '+a)
-                if not isinstance(prefix, unicode):
-                    prefix = prefix.decode(preferred_encoding, 'replace')
-                prefix = ascii_filename(prefix)
-                names.append('%s_%d%s'%(prefix, id, os.path.splitext(f)[1]))
-        remove = remove_ids if delete_from_library else []
-        self.upload_books(gf, names, good, on_card, memory=(_files, remove))
-        self.status_bar.showMessage(_('Sending books to device.'), 5000)
-        
-        if bad:
-            if specific_format is None:
-                if 'epub' in self.device_manager.device_class.FORMATS:
-                    format = 'epub'
-                elif 'mobi' in self.device_manager.device_class.FORMATS or 'prc' in self.device_manager.device_class.FORMATS:
-                    format = 'mobi'
-                elif 'lrf' in self.device_manager.device_class.FORMATS:
-                    format = 'lrf'
-            else:
-                format = specific_format
-            
-            if format not in ('epub', 'mobi'):
-                auto_convert = False
-
-            bad = '\n'.join('<li>%s</li>'%(i,) for i in bad)
-            if auto_convert:
-                d = info_dialog(self, _('No suitable formats'),
-                    _('Auto converting the following books before uploading to the device:<br><ul>%s</ul>')%(bad,))
-                self.auto_convert(_auto_rows, on_card, format)
-            else:
-                d = warning_dialog(self, _('No suitable formats'),
-                    _('Could not upload the following books to the device, as no suitable formats were found:<br><ul>%s</ul>')%(bad,)) 
-            d.exec_()
-
-
-    ############################################################################
 
     ############################## Save to disk ################################
     def save_single_format_to_disk(self, checked):
         self.save_to_disk(checked, True, config['save_to_disk_single_format'])
-    
+
     def save_to_single_dir(self, checked):
         self.save_to_disk(checked, True)
 
     def save_to_disk(self, checked, single_dir=False, single_format=None):
-        
+
         rows = self.current_view().selectionModel().selectedRows()
         if not rows or len(rows) == 0:
-            d = error_dialog(self, _('Cannot save to disk'), _('No books selected'))
+            d = error_dialog(self, _('Cannot save to disk'),
+                    _('No books selected'))
             d.exec_()
             return
-        
+
         progress = ProgressDialog(_('Saving to disk...'), min=0, max=len(rows),
                                   parent=self)
-        
+
         def callback(count, msg):
             progress.set_value(count)
             progress.set_msg(_('Saved')+' '+msg)
@@ -1010,11 +895,12 @@ class Main(MainWindow, Ui_MainWindow):
             QApplication.sendPostedEvents()
             QApplication.flush()
             return not progress.canceled
-        
-        dir = choose_dir(self, 'save to disk dialog', _('Choose destination directory'))
+
+        dir = choose_dir(self, 'save to disk dialog',
+                _('Choose destination directory'))
         if not dir:
             return
-            
+
         progress.show()
         QApplication.processEvents()
         QApplication.sendPostedEvents()
@@ -1022,24 +908,29 @@ class Main(MainWindow, Ui_MainWindow):
         try:
             if self.current_view() == self.library_view:
                 failures = self.current_view().model().save_to_disk(rows, dir,
-                                        single_dir=single_dir, callback=callback, 
+                                        single_dir=single_dir,
+                                        callback=callback,
                                         single_format=single_format)
                 if failures and single_format is not None:
-                    msg = _('<p>Could not save the following books to disk, because the %s format is not available for them:<ul>')%single_format.upper()
+                    msg = _('<p>Could not save the following books to disk, '
+                       'because the %s format is not available for them:<ul>')\
+                               %single_format.upper()
                     for f in failures:
                         msg += '<li>%s</li>'%f[1]
                     msg += '</ul>'
-                    warning_dialog(self, _('Could not save some ebooks'), msg).exec_()
+                    warning_dialog(self, _('Could not save some ebooks'),
+                            msg).exec_()
                 QDesktopServices.openUrl(QUrl('file:'+dir))
             else:
                 paths = self.current_view().model().paths(rows)
-                self.device_manager.save_books(Dispatcher(self.books_saved), paths, dir)
+                self.device_manager.save_books(
+                        Dispatcher(self.books_saved), paths, dir)
         finally:
             progress.hide()
-            
+
     def books_saved(self, job):
         if job.exception is not None:
-            self.device_job_exception(job)            
+            self.device_job_exception(job)
             return
 
     ############################################################################
@@ -1047,12 +938,14 @@ class Main(MainWindow, Ui_MainWindow):
     ############################### Fetch news #################################
 
     def download_scheduled_recipe(self, recipe, script, callback):
-        func, args, desc, fmt, temp_files = fetch_scheduled_recipe(recipe, script)
-        job = self.job_manager.run_job(Dispatcher(self.scheduled_recipe_fetched), func, args=args,
-                                            description=desc)
+        func, args, desc, fmt, temp_files = \
+                fetch_scheduled_recipe(recipe, script)
+        job = self.job_manager.run_job(
+                Dispatcher(self.scheduled_recipe_fetched), func, args=args,
+                           description=desc)
         self.conversion_jobs[job] = (temp_files, fmt, recipe, callback)
         self.status_bar.showMessage(_('Fetching news from ')+recipe.title, 2000)
-    
+
     def scheduled_recipe_fetched(self, job):
         temp_files, fmt, recipe, callback = self.conversion_jobs.pop(job)
         pt = temp_files[0]
@@ -1066,15 +959,16 @@ class Main(MainWindow, Ui_MainWindow):
         dynamic.set('news_to_be_synced', sync)
         callback(recipe)
         self.status_bar.showMessage(recipe.title + _(' fetched.'), 3000)
+        self.email_news(id)
         self.sync_news()
-            
+
     ############################################################################
 
     ############################### Convert ####################################
-    
+
     def auto_convert(self, rows, on_card, format):
         previous = self.library_view.currentIndex()
-     
+
         comics, others = [], []
         db = self.library_view.model().db
         for r in rows:
@@ -1085,23 +979,25 @@ class Main(MainWindow, Ui_MainWindow):
                 comics.append(r)
             else:
                 others.append(r)
-        
+
         jobs, changed, bad_rows = auto_convert_ebook(format, self, self.library_view.model().db, comics, others)
         for func, args, desc, fmt, id, temp_files in jobs:
             if id not in bad_rows:
-                job = self.job_manager.run_job(Dispatcher(self.book_auto_converted), 
+                job = self.job_manager.run_job(Dispatcher(self.book_auto_converted),
                                             func, args=args, description=desc)
                 self.conversion_jobs[job] = (temp_files, fmt, id, on_card)
-            
+
         if changed:
             self.library_view.model().refresh_rows(rows)
             current = self.library_view.currentIndex()
             self.library_view.model().current_changed(current, previous)
-    
+
     def get_books_for_conversion(self):
-        rows = [r.row() for r in self.library_view.selectionModel().selectedRows()]
+        rows = [r.row() for r in \
+                self.library_view.selectionModel().selectedRows()]
         if not rows or len(rows) == 0:
-            d = error_dialog(self, _('Cannot convert'), _('No books selected'))
+            d = error_dialog(self, _('Cannot convert'),
+                    _('No books selected'))
             d.exec_()
             return [], []
         comics, others = [], []
@@ -1115,50 +1011,53 @@ class Main(MainWindow, Ui_MainWindow):
             else:
                 others.append(r)
         return comics, others
-    
-        
+
+
     def convert_bulk(self, checked):
         r = self.get_books_for_conversion()
         if r is None:
             return
-        comics, others = r 
-        
-        res  = convert_bulk_ebooks(self, self.library_view.model().db, comics, others)
+        comics, others = r
+
+        res  = convert_bulk_ebooks(self,
+                self.library_view.model().db, comics, others)
         if res is None:
             return
-        jobs, changed = res 
+        jobs, changed = res
         for func, args, desc, fmt, id, temp_files in jobs:
-            job = self.job_manager.run_job(Dispatcher(self.book_converted), 
+            job = self.job_manager.run_job(Dispatcher(self.book_converted),
                                             func, args=args, description=desc)
             self.conversion_jobs[job] = (temp_files, fmt, id)
-            
+
         if changed:
             self.library_view.model().resort(reset=False)
             self.library_view.model().research()
-            
+
     def set_conversion_defaults(self, checked):
         set_conversion_defaults(False, self, self.library_view.model().db)
-        
+
     def set_comic_conversion_defaults(self, checked):
         set_conversion_defaults(True, self, self.library_view.model().db)
-    
+
     def convert_single(self, checked):
         r = self.get_books_for_conversion()
         if r is None: return
         previous = self.library_view.currentIndex()
-        rows = [x.row() for x in self.library_view.selectionModel().selectedRows()]
+        rows = [x.row() for x in \
+                self.library_view.selectionModel().selectedRows()]
         comics, others = r
-        jobs, changed = convert_single_ebook(self, self.library_view.model().db, comics, others)
+        jobs, changed = convert_single_ebook(self,
+                self.library_view.model().db, comics, others)
         for func, args, desc, fmt, id, temp_files in jobs:
-            job = self.job_manager.run_job(Dispatcher(self.book_converted), 
+            job = self.job_manager.run_job(Dispatcher(self.book_converted),
                                             func, args=args, description=desc)
             self.conversion_jobs[job] = (temp_files, fmt, id)
-            
+
         if changed:
             self.library_view.model().refresh_rows(rows)
             current = self.library_view.currentIndex()
             self.library_view.model().current_changed(current, previous)
-                  
+
     def book_auto_converted(self, job):
         temp_files, fmt, book_id, on_card = self.conversion_jobs.pop(job)
         try:
@@ -1183,7 +1082,7 @@ class Main(MainWindow, Ui_MainWindow):
 
         r = self.library_view.model().index(self.library_view.model().db.row(book_id), 0)
         self.sync_to_device(on_card, False, specific_format=fmt, send_rows=[r], auto_convert=False)
-    
+
     def book_converted(self, job):
         temp_files, fmt, book_id = self.conversion_jobs.pop(job)
         try:
@@ -1191,9 +1090,11 @@ class Main(MainWindow, Ui_MainWindow):
                 self.job_exception(job)
                 return
             data = open(temp_files[-1].name, 'rb')
-            self.library_view.model().db.add_format(book_id, fmt, data, index_is_id=True)
+            self.library_view.model().db.add_format(book_id, \
+                    fmt, data, index_is_id=True)
             data.close()
-            self.status_bar.showMessage(job.description + (' completed'), 2000)
+            self.status_bar.showMessage(job.description + \
+                    (' completed'), 2000)
         finally:
             for f in temp_files:
                 try:
@@ -1205,18 +1106,19 @@ class Main(MainWindow, Ui_MainWindow):
         if self.current_view() is self.library_view:
             current = self.library_view.currentIndex()
             self.library_view.model().current_changed(current, QModelIndex())
-    
+
     #############################View book######################################
 
     def view_format(self, row, format):
-        self._view_file(self.library_view.model().db.format(row, format, as_file=True).name)
-        
+        self._view_file(self.library_view.model().db.format(row,
+            format, as_file=True).name)
+
     def book_downloaded_for_viewing(self, job):
         if job.exception:
-            self.device_job_exception(job)            
+            self.device_job_exception(job)
             return
         self._view_file(job.result)
-    
+
     def _view_file(self, name):
         self.setCursor(Qt.BusyCursor)
         try:
@@ -1224,13 +1126,13 @@ class Main(MainWindow, Ui_MainWindow):
             if ext in config['internally_viewed_formats']:
                 if ext == 'LRF':
                     args = ['lrfviewer', name]
-                    self.job_manager.server.run_free_job('lrfviewer', 
+                    self.job_manager.server.run_free_job('lrfviewer',
                                                         kwdargs=dict(args=args))
                 else:
                     args = ['ebook-viewer', name]
                     if isosx:
                         args.append('--raise-window')
-                    self.job_manager.server.run_free_job('ebook-viewer', 
+                    self.job_manager.server.run_free_job('ebook-viewer',
                                                         kwdargs=dict(args=args))
             else:
                 QDesktopServices.openUrl(QUrl('file:'+name))#launch(name)
@@ -1254,19 +1156,20 @@ class Main(MainWindow, Ui_MainWindow):
             self.view_format(row, format)
         else:
             return
-    
+
     def view_folder(self, *args):
         rows = self.current_view().selectionModel().selectedRows()
         if self.current_view() is self.library_view:
             if not rows or len(rows) == 0:
-                d = error_dialog(self, _('Cannot open folder'), _('No book selected'))
+                d = error_dialog(self, _('Cannot open folder'),
+                        _('No book selected'))
                 d.exec_()
                 return
         for row in rows:
             path = self.library_view.model().db.abspath(row.row())
             QDesktopServices.openUrl(QUrl('file:'+path))
-        
-    
+
+
     def view_book(self, triggered):
         rows = self.current_view().selectionModel().selectedRows()
         if self.current_view() is self.library_view:
@@ -1276,7 +1179,8 @@ class Main(MainWindow, Ui_MainWindow):
                 return
 
             row = rows[0].row()
-            formats = self.library_view.model().db.formats(row).upper().split(',')
+            formats = self.library_view.model().db.formats(row).upper()
+            formats = formats.split(',')
             title   = self.library_view.model().db.title(row)
             id      = self.library_view.model().db.id(row)
             format = None
@@ -1294,7 +1198,8 @@ class Main(MainWindow, Ui_MainWindow):
                 d.exec_()
                 return
             if format is None:
-                d = ChooseFormatDialog(self, _('Choose the format to view'), formats)
+                d = ChooseFormatDialog(self, _('Choose the format to view'),
+                        formats)
                 d.exec_()
                 if d.result() == QDialog.Accepted:
                     format = d.format()
@@ -1305,14 +1210,16 @@ class Main(MainWindow, Ui_MainWindow):
         else:
             paths = self.current_view().model().paths(rows)
             if paths:
-                pt = PersistentTemporaryFile('_viewer_'+os.path.splitext(paths[0])[1])
+                pt = PersistentTemporaryFile('_viewer_'+\
+                        os.path.splitext(paths[0])[1])
                 self.persistent_files.append(pt)
                 pt.close()
-                self.device_manager.view_book(Dispatcher(self.book_downloaded_for_viewing),
+                self.device_manager.view_book(\
+                        Dispatcher(self.book_downloaded_for_viewing),
                                               paths[0], pt.name)
-                
-        
-    
+
+
+
     ############################################################################
 
     ########################### Do advanced search #############################
@@ -1328,16 +1235,23 @@ class Main(MainWindow, Ui_MainWindow):
 
     def do_config(self, *args):
         if self.job_manager.has_jobs():
-            d = error_dialog(self, _('Cannot configure'), _('Cannot configure while there are running jobs.'))
+            d = error_dialog(self, _('Cannot configure'),
+                    _('Cannot configure while there are running jobs.'))
             d.exec_()
             return
-        d = ConfigDialog(self, self.library_view.model().db, server=self.content_server)
+        d = ConfigDialog(self, self.library_view.model().db,
+                server=self.content_server)
         d.exec_()
         self.content_server = d.server
         if d.result() == d.Accepted:
             self.tool_bar.setIconSize(config['toolbar_icon_size'])
-            self.tool_bar.setToolButtonStyle(Qt.ToolButtonTextUnderIcon if config['show_text_in_toolbar'] else Qt.ToolButtonIconOnly)
-            self.save_menu.actions()[2].setText(_('Save only %s format to disk')%config.get('save_to_disk_single_format').upper())
+            self.tool_bar.setToolButtonStyle(
+                    Qt.ToolButtonTextUnderIcon if \
+                            config['show_text_in_toolbar'] else \
+                            Qt.ToolButtonIconOnly)
+            self.save_menu.actions()[2].setText(
+                _('Save only %s format to disk')%config.get(
+                    'save_to_disk_single_format').upper())
             if self.library_path != d.database_location:
                 try:
                     newloc = d.database_location
@@ -1348,10 +1262,12 @@ class Main(MainWindow, Ui_MainWindow):
                             pd.setCancelButton(None)
                             pd.setWindowTitle(_('Copying database'))
                             pd.show()
-                            self.status_bar.showMessage(_('Copying library to ')+newloc)
+                            self.status_bar.showMessage(
+                                    _('Copying library to ')+newloc)
                             self.setCursor(Qt.BusyCursor)
                             self.library_view.setEnabled(False)
-                            self.library_view.model().db.move_library_to(newloc, pd)
+                            self.library_view.model().db.move_library_to(
+                                    newloc, pd)
                     else:
                         try:
                             db = LibraryDatabase2(newloc)
@@ -1359,13 +1275,18 @@ class Main(MainWindow, Ui_MainWindow):
                         except Exception, err:
                             traceback.print_exc()
                             d = error_dialog(self, _('Invalid database'),
-                                             _('<p>An invalid database already exists at %s, delete it before trying to move the existing database.<br>Error: %s')%(newloc, str(err)))
+                                _('<p>An invalid database already exists at '
+                                  '%s, delete it before trying to move the '
+                                  'existing database.<br>Error: %s')%(newloc,
+                                      str(err)))
                             d.exec_()
-                    self.library_path = self.library_view.model().db.library_path
+                    self.library_path = \
+                            self.library_view.model().db.library_path
                     prefs['library_path'] =  self.library_path
                 except Exception, err:
                     traceback.print_exc()
-                    d = error_dialog(self, _('Could not move database'), unicode(err))
+                    d = error_dialog(self, _('Could not move database'),
+                            unicode(err))
                     d.exec_()
                 finally:
                     self.unsetCursor()
@@ -1378,6 +1299,8 @@ class Main(MainWindow, Ui_MainWindow):
             if hasattr(d, 'directories'):
                 set_sidebar_directories(d.directories)
             self.library_view.model().read_config()
+            self.create_device_menu()
+
 
     ############################################################################
 
@@ -1386,7 +1309,8 @@ class Main(MainWindow, Ui_MainWindow):
     def show_book_info(self, *args):
         if self.current_view() is not self.library_view:
             error_dialog(self, _('No detailed info available'),
-                         _('No detailed information is available for books on the device.')).exec_()
+                _('No detailed information is available for books '
+                  'on the device.')).exec_()
             return
         index = self.library_view.currentIndex()
         if index.isValid():
@@ -1401,7 +1325,8 @@ class Main(MainWindow, Ui_MainWindow):
         '''
         page = 0 if location == 'library' else 1 if location == 'main' else 2
         self.stack.setCurrentIndex(page)
-        view = self.memory_view if page == 1 else self.card_view if page == 2 else None
+        view = self.memory_view if page == 1 else \
+                self.card_view if page == 2 else None
         if view:
             if view.resize_on_select:
                 view.resizeRowsToContents()
@@ -1411,27 +1336,30 @@ class Main(MainWindow, Ui_MainWindow):
         self.status_bar.reset_info()
         self.current_view().clearSelection()
         if location == 'library':
-            if self.device_connected:
-                self.action_sync.setEnabled(True)
             self.action_edit.setEnabled(True)
             self.action_convert.setEnabled(True)
             self.view_menu.actions()[1].setEnabled(True)
             self.action_open_containing_folder.setEnabled(True)
+            self.action_sync.setEnabled(True)
         else:
-            self.action_sync.setEnabled(False)
             self.action_edit.setEnabled(False)
             self.action_convert.setEnabled(False)
             self.view_menu.actions()[1].setEnabled(False)
             self.action_open_containing_folder.setEnabled(False)
-                
+            self.action_sync.setEnabled(False)
+
+
     def device_job_exception(self, job):
         '''
         Handle exceptions in threaded device jobs.
         '''
         try:
-            if 'Could not read 32 bytes on the control bus.' in unicode(job.exception):
-                error_dialog(self, _('Error talking to device'), 
-                             _('There was a temporary error talking to the device. Please unplug and reconnect the device and or reboot.')).show()
+            if 'Could not read 32 bytes on the control bus.' in \
+                    unicode(job.exception):
+                error_dialog(self, _('Error talking to device'),
+                             _('There was a temporary error talking to the '
+                             'device. Please unplug and reconnect the device '
+                             'and or reboot.')).show()
                 return
         except:
             pass
@@ -1442,12 +1370,16 @@ class Main(MainWindow, Ui_MainWindow):
         if not self.device_error_dialog.isVisible():
             self.device_error_dialog.set_message(job.gui_text())
             self.device_error_dialog.show()
-            
+
     def job_exception(self, job):
         try:
             if job.exception[0] == 'DRMError':
-                error_dialog(self, _('Conversion Error'), 
-                    _('<p>Could not convert: %s<p>It is a <a href="%s">DRM</a>ed book. You must first remove the DRM using 3rd party tools.')%(job.description.split(':')[-1], 'http://wiki.mobileread.com/wiki/DRM')).exec_()
+                error_dialog(self, _('Conversion Error'),
+                    _('<p>Could not convert: %s<p>It is a '
+                      '<a href="%s">DRM</a>ed book. You must first remove the '
+                      'DRM using 3rd party tools.')%\
+                        (job.description.split(':')[-1],
+                            'http://wiki.mobileread.com/wiki/DRM')).exec_()
                 return
         except:
             pass
@@ -1476,11 +1408,12 @@ class Main(MainWindow, Ui_MainWindow):
             if iswindows:
                 from calibre import plugins
                 from PyQt4.Qt import QDir
-                base = plugins['winutil'][0].special_folder_path(plugins['winutil'][0].CSIDL_PERSONAL)
+                base = plugins['winutil'][0].special_folder_path(
+                        plugins['winutil'][0].CSIDL_PERSONAL)
                 if not base or not os.path.exists(base):
                     base = unicode(QDir.homePath()).replace('/', os.sep)
-            dir = unicode(QFileDialog.getExistingDirectory(self, 
-                            _('Choose a location for your ebook library.'), base))
+            dir = unicode(QFileDialog.getExistingDirectory(self,
+                        _('Choose a location for your ebook library.'), base))
             if not dir:
                 dir = os.path.expanduser('~/Library')
             self.library_path = os.path.abspath(dir)
@@ -1489,9 +1422,9 @@ class Main(MainWindow, Ui_MainWindow):
                 os.makedirs(self.library_path)
             except:
                 self.library_path = os.path.expanduser('~/Library')
-                error_dialog(self, _('Invalid library location'), 
+                error_dialog(self, _('Invalid library location'),
                      _('Could not access %s. Using %s as the library.')%
-                     (repr(self.library_path), repr(self.library_path)) 
+                     (repr(self.library_path), repr(self.library_path))
                              ).exec_()
                 os.makedirs(self.library_path)
 
@@ -1503,17 +1436,23 @@ class Main(MainWindow, Ui_MainWindow):
             self.restoreGeometry(geometry)
         set_sidebar_directories(None)
         self.tool_bar.setIconSize(config['toolbar_icon_size'])
-        self.tool_bar.setToolButtonStyle(Qt.ToolButtonTextUnderIcon if config['show_text_in_toolbar'] else Qt.ToolButtonIconOnly)
-        
-    
+        self.tool_bar.setToolButtonStyle(
+                Qt.ToolButtonTextUnderIcon if \
+                    config['show_text_in_toolbar'] else \
+                    Qt.ToolButtonIconOnly)
+
+
     def write_settings(self):
         config.set('main_window_geometry', self.saveGeometry())
         dynamic.set('sort_column', self.library_view.model().sorted_on)
         self.library_view.write_settings()
         if self.device_connected:
             self.memory_view.write_settings()
-    
-    def quit(self, checked, restart=False):
+
+    def restart(self):
+        self.quit(restart=True)
+
+    def quit(self, checked=True, restart=False):
         if not self.confirm_quit():
             return
         try:
@@ -1522,7 +1461,7 @@ class Main(MainWindow, Ui_MainWindow):
             pass
         self.restart_after_quit = restart
         QApplication.instance().quit()
-            
+
     def donate(self, *args):
         BUTTON = '''
         <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
@@ -1532,7 +1471,9 @@ class Main(MainWindow, Ui_MainWindow):
             <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
         </form>
         '''
-        MSG = _('is the result of the efforts of many volunteers from all over the world. If you find it useful, please consider donating to support its development.')
+        MSG = _('is the result of the efforts of many volunteers from all '
+                'over the world. If you find it useful, please consider '
+                'donating to support its development.')
         HTML = u'''
         <html>
             <head>
@@ -1550,16 +1491,17 @@ class Main(MainWindow, Ui_MainWindow):
         pt.write(HTML.encode('utf-8'))
         pt.close()
         QDesktopServices.openUrl(QUrl.fromLocalFile(pt.name))
-            
-    
+
+
     def confirm_quit(self):
         if self.job_manager.has_jobs():
             msg = _('There are active jobs. Are you sure you want to quit?')
             if self.job_manager.has_device_jobs():
-                msg = '<p>'+__appname__ + _(''' is communicating with the device!<br>
+                msg = '<p>'+__appname__ + \
+                      _(''' is communicating with the device!<br>
                       'Quitting may cause corruption on the device.<br>
                       'Are you sure you want to quit?''')+'</p>'
-            
+
             d = QMessageBox(QMessageBox.Warning, _('WARNING: Active jobs'), msg,
                             QMessageBox.Yes|QMessageBox.No, self)
             d.setIconPixmap(QPixmap(':/images/dialog_warning.svg'))
@@ -1568,7 +1510,7 @@ class Main(MainWindow, Ui_MainWindow):
                 return False
         return True
 
-    
+
     def shutdown(self, write_settings=True):
         if write_settings:
             self.write_settings()
@@ -1577,6 +1519,7 @@ class Main(MainWindow, Ui_MainWindow):
         self.cover_cache.stop()
         self.hide()
         self.cover_cache.terminate()
+        self.emailer.stop()
         try:
             try:
                 if self.content_server is not None:
@@ -1589,12 +1532,15 @@ class Main(MainWindow, Ui_MainWindow):
         self.hide()
         return True
 
-    
+
     def closeEvent(self, e):
         self.write_settings()
         if self.system_tray_icon.isVisible():
             if not dynamic['systray_msg'] and not isosx:
-                info_dialog(self, 'calibre', 'calibre '+_('will keep running in the system tray. To close it, choose <b>Quit</b> in the context menu of the system tray.')).exec_()
+                info_dialog(self, 'calibre', 'calibre '+\
+                        _('will keep running in the system tray. To close it, '
+                        'choose <b>Quit</b> in the context menu of the '
+                        'system tray.')).exec_()
                 dynamic['systray_msg'] = True
             self.hide()
             e.ignore()
@@ -1611,17 +1557,25 @@ class Main(MainWindow, Ui_MainWindow):
     def update_found(self, version):
         os = 'windows' if iswindows else 'osx' if isosx else 'linux'
         url = 'http://%s.kovidgoyal.net/download_%s'%(__appname__, os)
-        self.latest_version = _('<span style="color:red; font-weight:bold">Latest version: <a href="%s">%s</a></span>')%(url, version)
-        self.vanity.setText(self.vanity_template%(dict(version=self.latest_version,
-                                                    device=self.device_info)))
+        self.latest_version = _('<span style="color:red; font-weight:bold">'
+                'Latest version: <a href="%s">%s</a></span>')%(url, version)
+        self.vanity.setText(self.vanity_template%\
+                (dict(version=self.latest_version,
+                      device=self.device_info)))
         self.vanity.update()
-        if config.get('new_version_notification') and dynamic.get('update to version %s'%version, True):
-            d = question_dialog(self, _('Update available'), _('%s has been updated to version %s. See the <a href="http://calibre.kovidgoyal.net/wiki/Changelog">new features</a>. Visit the download page?')%(__appname__, version))
+        if config.get('new_version_notification') and \
+                dynamic.get('update to version %s'%version, True):
+            d = question_dialog(self, _('Update available'),
+                    _('%s has been updated to version %s. '
+                    'See the <a href="http://calibre.kovidgoyal.net/wiki/'
+                    'Changelog">new features</a>. Visit the download pa'
+                    'ge?')%(__appname__, version))
             if d.exec_() == QMessageBox.Yes:
-                url = 'http://calibre.kovidgoyal.net/download_'+('windows' if iswindows else 'osx' if isosx else 'linux')
+                url = 'http://calibre.kovidgoyal.net/download_'+\
+                    ('windows' if iswindows else 'osx' if isosx else 'linux')
                 QDesktopServices.openUrl(QUrl(url))
             dynamic.set('update to version %s'%version, False)
-        
+
 
 def option_parser():
     parser = _option_parser('''\
@@ -1630,7 +1584,7 @@ def option_parser():
 Launch the main calibre Graphical User Interface and optionally add the ebook at
 path_to_ebook to the database.
 ''')
-    parser.add_option('--with-library', default=None, action='store', 
+    parser.add_option('--with-library', default=None, action='store',
                       help=_('Use the library located at the specified path.'))
     parser.add_option('--start-in-tray', default=False, action='store_true',
                       help=_('Start minimized to system tray.'))
@@ -1640,7 +1594,7 @@ path_to_ebook to the database.
 
 def main(args=sys.argv):
     from calibre.utils.lock import singleinstance
-    
+
     pid = os.fork() if False and islinux else -1
     if pid <= 0:
         parser = option_parser()
@@ -1653,17 +1607,20 @@ def main(args=sys.argv):
         app.setWindowIcon(QIcon(':/library'))
         QCoreApplication.setOrganizationName(ORG_NAME)
         QCoreApplication.setApplicationName(APP_UID)
-        single_instance = None if SingleApplication is None else SingleApplication('calibre GUI')
+        single_instance = None if SingleApplication is None else \
+                                  SingleApplication('calibre GUI')
         if not singleinstance('calibre GUI'):
             if len(args) > 1:
                 args[1] = os.path.abspath(args[1])
-            if single_instance is not None and single_instance.is_running() and \
+            if single_instance is not None and \
+               single_instance.is_running() and \
                single_instance.send_message('launched:'+repr(args)):
-                    return 0
+                return 0
             extra = '' if iswindows else \
-            	('If you\'re sure it is not running, delete the file %s.'%os.path.expanduser('~/.calibre_calibre GUI.lock'))
+                    ('If you\'re sure it is not running, delete the file '
+                    '%s.'%os.path.expanduser('~/.calibre_calibre GUI.lock'))
             QMessageBox.critical(None, 'Cannot Start '+__appname__,
-                                 '<p>%s is already running. %s</p>'%(__appname__, extra))
+                        '<p>%s is already running. %s</p>'%(__appname__, extra))
             return 1
         initialize_file_icon_provider()
         main = Main(single_instance, opts, actions)
@@ -1672,7 +1629,7 @@ def main(args=sys.argv):
             main.add_filesystem_book(args[1])
         ret = app.exec_()
         if getattr(main, 'restart_after_quit', False):
-            e = sys.executable if getattr(sys, 'froze', False) else sys.argv[0] 
+            e = sys.executable if getattr(sys, 'froze', False) else sys.argv[0]
             print 'Restarting with:', e, sys.argv
             os.execvp(e, sys.argv)
         else:
@@ -1695,6 +1652,7 @@ if __name__ == '__main__':
         logfile = os.path.join(os.path.expanduser('~'), 'calibre.log')
         if os.path.exists(logfile):
             log = open(logfile).read().decode('utf-8', 'ignore')
-            d = QErrorMessage('<b>Error:</b>%s<br><b>Traceback:</b><br>%s<b>Log:</b><br>'%(unicode(err), unicode(tb), log))
+            d = QErrorMessage(('<b>Error:</b>%s<br><b>Traceback:</b><br>'
+                '%s<b>Log:</b><br>%s')%(unicode(err), unicode(tb), log))
             d.exec_()
 
diff --git a/src/calibre/gui2/main.ui b/src/calibre/gui2/main.ui
index c4bea8d886..fbae01d3e6 100644
--- a/src/calibre/gui2/main.ui
+++ b/src/calibre/gui2/main.ui
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <author>Kovid Goyal</author>
  <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
@@ -11,140 +10,149 @@
     <height>822</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="contextMenuPolicy">
+  <property name="contextMenuPolicy" >
    <enum>Qt::NoContextMenu</enum>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string>__appname__</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
+  <property name="windowIcon" >
+   <iconset resource="images.qrc" >
     <normaloff>:/library</normaloff>:/library</iconset>
   </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QGridLayout" name="gridLayout" >
+    <item row="0" column="0" >
+     <layout class="QHBoxLayout" name="horizontalLayout_3" >
       <item>
-       <widget class="LocationView" name="location_view">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <widget class="LocationView" name="location_view" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize">
+        <property name="maximumSize" >
          <size>
           <width>16777215</width>
           <height>100</height>
          </size>
         </property>
-        <property name="verticalScrollBarPolicy">
+        <property name="verticalScrollBarPolicy" >
          <enum>Qt::ScrollBarAlwaysOff</enum>
         </property>
-        <property name="horizontalScrollBarPolicy">
+        <property name="horizontalScrollBarPolicy" >
          <enum>Qt::ScrollBarAsNeeded</enum>
         </property>
-        <property name="tabKeyNavigation">
+        <property name="editTriggers" >
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+        <property name="tabKeyNavigation" >
          <bool>true</bool>
         </property>
-        <property name="showDropIndicator" stdset="0">
+        <property name="showDropIndicator" stdset="0" >
          <bool>true</bool>
         </property>
-        <property name="iconSize">
+        <property name="selectionMode" >
+         <enum>QAbstractItemView::NoSelection</enum>
+        </property>
+        <property name="selectionBehavior" >
+         <enum>QAbstractItemView::SelectRows</enum>
+        </property>
+        <property name="iconSize" >
          <size>
           <width>40</width>
           <height>40</height>
          </size>
         </property>
-        <property name="movement">
+        <property name="movement" >
          <enum>QListView::Static</enum>
         </property>
-        <property name="flow">
+        <property name="flow" >
          <enum>QListView::LeftToRight</enum>
         </property>
-        <property name="gridSize">
+        <property name="gridSize" >
          <size>
           <width>175</width>
           <height>90</height>
          </size>
         </property>
-        <property name="viewMode">
+        <property name="viewMode" >
          <enum>QListView::ListMode</enum>
         </property>
-        <property name="wordWrap">
+        <property name="wordWrap" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="donate_button">
-        <property name="cursor">
+       <widget class="QToolButton" name="donate_button" >
+        <property name="cursor" >
          <cursorShape>PointingHandCursor</cursorShape>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>...</string>
         </property>
-        <property name="icon">
-         <iconset resource="images.qrc">
+        <property name="icon" >
+         <iconset resource="images.qrc" >
           <normaloff>:/images/donate.svg</normaloff>:/images/donate.svg</iconset>
         </property>
-        <property name="iconSize">
+        <property name="iconSize" >
          <size>
           <width>64</width>
           <height>64</height>
          </size>
         </property>
-        <property name="autoRaise">
+        <property name="autoRaise" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
+       <layout class="QVBoxLayout" name="verticalLayout_3" >
         <item>
-         <widget class="QLabel" name="vanity">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <widget class="QLabel" name="vanity" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="maximumSize">
+          <property name="maximumSize" >
            <size>
             <width>16777215</width>
             <height>90</height>
            </size>
           </property>
-          <property name="text">
+          <property name="text" >
            <string/>
           </property>
-          <property name="textFormat">
+          <property name="textFormat" >
            <enum>Qt::RichText</enum>
           </property>
-          <property name="openExternalLinks">
+          <property name="openExternalLinks" >
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <layout class="QHBoxLayout" name="horizontalLayout_2" >
           <item>
-           <widget class="QLabel" name="label_2">
-            <property name="text">
+           <widget class="QLabel" name="label_2" >
+            <property name="text" >
              <string>Output:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QComboBox" name="output_format">
-            <property name="toolTip">
+           <widget class="QComboBox" name="output_format" >
+            <property name="toolTip" >
              <string>Set the output format that is used when converting ebooks and downloading news</string>
             </property>
            </widget>
@@ -155,99 +163,99 @@
       </item>
      </layout>
     </item>
-    <item row="1" column="0">
-     <layout class="QHBoxLayout">
-      <property name="spacing">
+    <item row="1" column="0" >
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="margin">
+      <property name="margin" >
        <number>0</number>
       </property>
       <item>
-       <widget class="QToolButton" name="advanced_search_button">
-        <property name="toolTip">
+       <widget class="QToolButton" name="advanced_search_button" >
+        <property name="toolTip" >
          <string>Advanced search</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>...</string>
         </property>
-        <property name="icon">
-         <iconset resource="images.qrc">
+        <property name="icon" >
+         <iconset resource="images.qrc" >
           <normaloff>:/images/search.svg</normaloff>:/images/search.svg</iconset>
         </property>
-        <property name="shortcut">
+        <property name="shortcut" >
          <string>Alt+S</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
+       <widget class="QLabel" name="label" >
+        <property name="text" >
          <string>&amp;Search:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>search</cstring>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="SearchBox" name="search">
-        <property name="enabled">
+       <widget class="SearchBox" name="search" >
+        <property name="enabled" >
          <bool>true</bool>
         </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="acceptDrops">
+        <property name="acceptDrops" >
          <bool>false</bool>
         </property>
-        <property name="toolTip">
-         <string>Search the list of books by title or author&lt;br&gt;&lt;br&gt;Words separated by spaces are ANDed</string>
+        <property name="toolTip" >
+         <string>Search the list of books by title or author&lt;br>&lt;br>Words separated by spaces are ANDed</string>
         </property>
-        <property name="whatsThis">
-         <string>Search the list of books by title, author, publisher, tags and comments&lt;br&gt;&lt;br&gt;Words separated by spaces are ANDed</string>
+        <property name="whatsThis" >
+         <string>Search the list of books by title, author, publisher, tags and comments&lt;br>&lt;br>Words separated by spaces are ANDed</string>
         </property>
-        <property name="autoFillBackground">
+        <property name="autoFillBackground" >
          <bool>false</bool>
         </property>
-        <property name="text">
+        <property name="text" >
          <string/>
         </property>
-        <property name="frame">
+        <property name="frame" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="clear_button">
-        <property name="toolTip">
+       <widget class="QToolButton" name="clear_button" >
+        <property name="toolTip" >
          <string>Reset Quick Search</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>...</string>
         </property>
-        <property name="icon">
-         <iconset resource="images.qrc">
+        <property name="icon" >
+         <iconset resource="images.qrc" >
           <normaloff>:/images/clear_left.svg</normaloff>:/images/clear_left.svg</iconset>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="Line" name="line">
-        <property name="orientation">
+       <widget class="Line" name="line" >
+        <property name="orientation" >
          <enum>Qt::Vertical</enum>
         </property>
        </widget>
       </item>
       <item>
        <spacer>
-        <property name="orientation">
+        <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0">
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>20</width>
           <height>20</height>
@@ -256,77 +264,77 @@
        </spacer>
       </item>
       <item>
-       <widget class="QToolButton" name="config_button">
-        <property name="toolTip">
+       <widget class="QToolButton" name="config_button" >
+        <property name="toolTip" >
          <string>Configuration</string>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>...</string>
         </property>
-        <property name="icon">
-         <iconset resource="images.qrc">
+        <property name="icon" >
+         <iconset resource="images.qrc" >
           <normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
         </property>
        </widget>
       </item>
      </layout>
     </item>
-    <item row="2" column="0">
-     <widget class="QStackedWidget" name="stack">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <item row="2" column="0" >
+     <widget class="QStackedWidget" name="stack" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
         <horstretch>100</horstretch>
         <verstretch>100</verstretch>
        </sizepolicy>
       </property>
-      <property name="currentIndex">
+      <property name="currentIndex" >
        <number>0</number>
       </property>
-      <widget class="QWidget" name="library">
-       <layout class="QVBoxLayout" name="verticalLayout_2">
+      <widget class="QWidget" name="library" >
+       <layout class="QVBoxLayout" name="verticalLayout_2" >
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
+         <layout class="QHBoxLayout" name="horizontalLayout" >
           <item>
-           <layout class="QVBoxLayout" name="verticalLayout">
+           <layout class="QVBoxLayout" name="verticalLayout" >
             <item>
-             <widget class="QRadioButton" name="match_any">
-              <property name="text">
+             <widget class="QRadioButton" name="match_any" >
+              <property name="text" >
                <string>Match any</string>
               </property>
-              <property name="checked">
+              <property name="checked" >
                <bool>false</bool>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QRadioButton" name="match_all">
-              <property name="text">
+             <widget class="QRadioButton" name="match_all" >
+              <property name="text" >
                <string>Match all</string>
               </property>
-              <property name="checked">
+              <property name="checked" >
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QCheckBox" name="popularity">
-              <property name="text">
+             <widget class="QCheckBox" name="popularity" >
+              <property name="text" >
                <string>Sort by &amp;popularity</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="TagsView" name="tags_view">
-              <property name="tabKeyNavigation">
+             <widget class="TagsView" name="tags_view" >
+              <property name="tabKeyNavigation" >
                <bool>true</bool>
               </property>
-              <property name="alternatingRowColors">
+              <property name="alternatingRowColors" >
                <bool>true</bool>
               </property>
-              <property name="animated">
+              <property name="animated" >
                <bool>true</bool>
               </property>
-              <property name="headerHidden">
+              <property name="headerHidden" >
                <bool>true</bool>
               </property>
              </widget>
@@ -334,35 +342,35 @@
            </layout>
           </item>
           <item>
-           <widget class="BooksView" name="library_view">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <widget class="BooksView" name="library_view" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
               <horstretch>100</horstretch>
               <verstretch>10</verstretch>
              </sizepolicy>
             </property>
-            <property name="acceptDrops">
+            <property name="acceptDrops" >
              <bool>true</bool>
             </property>
-            <property name="dragEnabled">
+            <property name="dragEnabled" >
              <bool>true</bool>
             </property>
-            <property name="dragDropOverwriteMode">
+            <property name="dragDropOverwriteMode" >
              <bool>false</bool>
             </property>
-            <property name="dragDropMode">
+            <property name="dragDropMode" >
              <enum>QAbstractItemView::DragDrop</enum>
             </property>
-            <property name="alternatingRowColors">
+            <property name="alternatingRowColors" >
              <bool>true</bool>
             </property>
-            <property name="selectionBehavior">
+            <property name="selectionBehavior" >
              <enum>QAbstractItemView::SelectRows</enum>
             </property>
-            <property name="showGrid">
+            <property name="showGrid" >
              <bool>false</bool>
             </property>
-            <property name="wordWrap">
+            <property name="wordWrap" >
              <bool>false</bool>
             </property>
            </widget>
@@ -371,76 +379,76 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="main_memory">
-       <layout class="QGridLayout">
-        <item row="0" column="0">
-         <widget class="DeviceBooksView" name="memory_view">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+      <widget class="QWidget" name="main_memory" >
+       <layout class="QGridLayout" >
+        <item row="0" column="0" >
+         <widget class="DeviceBooksView" name="memory_view" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
             <horstretch>100</horstretch>
             <verstretch>10</verstretch>
            </sizepolicy>
           </property>
-          <property name="acceptDrops">
+          <property name="acceptDrops" >
            <bool>true</bool>
           </property>
-          <property name="dragEnabled">
+          <property name="dragEnabled" >
            <bool>true</bool>
           </property>
-          <property name="dragDropOverwriteMode">
+          <property name="dragDropOverwriteMode" >
            <bool>false</bool>
           </property>
-          <property name="dragDropMode">
+          <property name="dragDropMode" >
            <enum>QAbstractItemView::DragDrop</enum>
           </property>
-          <property name="alternatingRowColors">
+          <property name="alternatingRowColors" >
            <bool>true</bool>
           </property>
-          <property name="selectionBehavior">
+          <property name="selectionBehavior" >
            <enum>QAbstractItemView::SelectRows</enum>
           </property>
-          <property name="showGrid">
+          <property name="showGrid" >
            <bool>false</bool>
           </property>
-          <property name="wordWrap">
+          <property name="wordWrap" >
            <bool>false</bool>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="page">
-       <layout class="QGridLayout">
-        <item row="0" column="0">
-         <widget class="DeviceBooksView" name="card_view">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+      <widget class="QWidget" name="page" >
+       <layout class="QGridLayout" >
+        <item row="0" column="0" >
+         <widget class="DeviceBooksView" name="card_view" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
             <horstretch>10</horstretch>
             <verstretch>10</verstretch>
            </sizepolicy>
           </property>
-          <property name="acceptDrops">
+          <property name="acceptDrops" >
            <bool>true</bool>
           </property>
-          <property name="dragEnabled">
+          <property name="dragEnabled" >
            <bool>true</bool>
           </property>
-          <property name="dragDropOverwriteMode">
+          <property name="dragDropOverwriteMode" >
            <bool>false</bool>
           </property>
-          <property name="dragDropMode">
+          <property name="dragDropMode" >
            <enum>QAbstractItemView::DragDrop</enum>
           </property>
-          <property name="alternatingRowColors">
+          <property name="alternatingRowColors" >
            <bool>true</bool>
           </property>
-          <property name="selectionBehavior">
+          <property name="selectionBehavior" >
            <enum>QAbstractItemView::SelectRows</enum>
           </property>
-          <property name="showGrid">
+          <property name="showGrid" >
            <bool>false</bool>
           </property>
-          <property name="wordWrap">
+          <property name="wordWrap" >
            <bool>false</bool>
           </property>
          </widget>
@@ -451,234 +459,225 @@
     </item>
    </layout>
   </widget>
-  <widget class="QToolBar" name="tool_bar">
-   <property name="minimumSize">
+  <widget class="QToolBar" name="tool_bar" >
+   <property name="minimumSize" >
     <size>
      <width>0</width>
      <height>0</height>
     </size>
    </property>
-   <property name="contextMenuPolicy">
+   <property name="contextMenuPolicy" >
     <enum>Qt::PreventContextMenu</enum>
    </property>
-   <property name="movable">
+   <property name="movable" >
     <bool>false</bool>
    </property>
-   <property name="orientation">
+   <property name="orientation" >
     <enum>Qt::Horizontal</enum>
    </property>
-   <property name="iconSize">
+   <property name="iconSize" >
     <size>
      <width>48</width>
      <height>48</height>
     </size>
    </property>
-   <property name="toolButtonStyle">
+   <property name="toolButtonStyle" >
     <enum>Qt::ToolButtonTextUnderIcon</enum>
    </property>
-   <attribute name="toolBarArea">
+   <attribute name="toolBarArea" >
     <enum>TopToolBarArea</enum>
    </attribute>
-   <attribute name="toolBarBreak">
+   <attribute name="toolBarBreak" >
     <bool>false</bool>
    </attribute>
-   <addaction name="action_add"/>
-   <addaction name="action_edit"/>
-   <addaction name="action_convert"/>
-   <addaction name="action_view"/>
-   <addaction name="action_news"/>
-   <addaction name="separator"/>
-   <addaction name="action_sync"/>
-   <addaction name="action_save"/>
-   <addaction name="action_del"/>
-   <addaction name="separator"/>
-   <addaction name="action_preferences"/>
+   <addaction name="action_add" />
+   <addaction name="action_edit" />
+   <addaction name="action_convert" />
+   <addaction name="action_view" />
+   <addaction name="action_news" />
+   <addaction name="separator" />
+   <addaction name="action_sync" />
+   <addaction name="action_save" />
+   <addaction name="action_del" />
+   <addaction name="separator" />
+   <addaction name="action_preferences" />
   </widget>
-  <widget class="QStatusBar" name="statusBar">
-   <property name="mouseTracking">
+  <widget class="QStatusBar" name="statusBar" >
+   <property name="mouseTracking" >
     <bool>true</bool>
    </property>
   </widget>
-  <action name="action_add">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_add" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/add_book.svg</normaloff>:/images/add_book.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Add books</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>A</string>
    </property>
-   <property name="autoRepeat">
+   <property name="autoRepeat" >
     <bool>false</bool>
    </property>
   </action>
-  <action name="action_del">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_del" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/trash.svg</normaloff>:/images/trash.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Remove books</string>
    </property>
-   <property name="toolTip">
+   <property name="toolTip" >
     <string>Remove books</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>Del</string>
    </property>
   </action>
-  <action name="action_edit">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_edit" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/edit_input.svg</normaloff>:/images/edit_input.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Edit meta information</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>E</string>
    </property>
-   <property name="autoRepeat">
+   <property name="autoRepeat" >
     <bool>false</bool>
    </property>
   </action>
-  <action name="action_sync">
-   <property name="enabled">
+  <action name="action_sync" >
+   <property name="enabled" >
     <bool>false</bool>
    </property>
-   <property name="icon">
-    <iconset resource="images.qrc">
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/sync.svg</normaloff>:/images/sync.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Send to device</string>
    </property>
   </action>
-  <action name="action_save">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_save" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/save.svg</normaloff>:/images/save.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Save to disk</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>S</string>
    </property>
   </action>
-  <action name="action_news">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_news" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/news.svg</normaloff>:/images/news.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Fetch news</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>F</string>
    </property>
   </action>
-  <action name="action_convert">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_convert" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/convert.svg</normaloff>:/images/convert.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Convert E-books</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>C</string>
    </property>
   </action>
-  <action name="action_view">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_view" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/view.svg</normaloff>:/images/view.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>View</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>V</string>
    </property>
   </action>
-  <action name="action_open_containing_folder">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_open_containing_folder" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Open containing folder</string>
    </property>
   </action>
-  <action name="action_show_book_details">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_show_book_details" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/dialog_information.svg</normaloff>:/images/dialog_information.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Show book details</string>
    </property>
   </action>
-  <action name="action_books_by_same_author">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_books_by_same_author" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/user_profile.svg</normaloff>:/images/user_profile.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Books by same author</string>
    </property>
   </action>
-  <action name="action_books_in_this_series">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_books_in_this_series" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/books_in_series.svg</normaloff>:/images/books_in_series.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Books in this series</string>
    </property>
   </action>
-  <action name="action_books_by_this_publisher">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_books_by_this_publisher" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/publisher.png</normaloff>:/images/publisher.png</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Books by this publisher</string>
    </property>
   </action>
-  <action name="action_books_with_the_same_tags">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_books_with_the_same_tags" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/tags.svg</normaloff>:/images/tags.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Books with the same tags</string>
    </property>
   </action>
-  <action name="action_send_specific_format_to_device">
-   <property name="icon">
-    <iconset resource="images.qrc">
-     <normaloff>:/images/book.svg</normaloff>:/images/book.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Send specific format to device</string>
-   </property>
-  </action>
-  <action name="action_preferences">
-   <property name="icon">
-    <iconset resource="images.qrc">
+  <action name="action_preferences" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
      <normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Preferences</string>
    </property>
-   <property name="toolTip">
+   <property name="toolTip" >
     <string>Configure calibre</string>
    </property>
-   <property name="shortcut">
+   <property name="shortcut" >
     <string>Ctrl+P</string>
    </property>
   </action>
@@ -711,7 +710,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="images.qrc"/>
+  <include location="images.qrc" />
  </resources>
  <connections>
   <connection>
@@ -720,11 +719,11 @@
    <receiver>search</receiver>
    <slot>clear()</slot>
    <hints>
-    <hint type="sourcelabel">
+    <hint type="sourcelabel" >
      <x>787</x>
      <y>215</y>
     </hint>
-    <hint type="destinationlabel">
+    <hint type="destinationlabel" >
      <x>755</x>
      <y>213</y>
     </hint>
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index caf2011a75..535ec4251f 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -7,9 +7,9 @@ import re, os, traceback
 from PyQt4.QtGui import QListView, QIcon, QFont, QLabel, QListWidget, \
                         QListWidgetItem, QTextCharFormat, QApplication, \
                         QSyntaxHighlighter, QCursor, QColor, QWidget, QDialog, \
-                        QPixmap
+                        QPixmap, QMovie, QPalette
 from PyQt4.QtCore import QAbstractListModel, QVariant, Qt, SIGNAL, \
-                         QObject, QRegExp, QString, QSettings, QSize
+                         QRegExp, QSettings, QSize, QModelIndex
 
 from calibre.gui2.jobs2 import DetailView
 from calibre.gui2 import human_readable, NONE, TableView, \
@@ -21,8 +21,44 @@ from calibre.ebooks.metadata.meta import metadata_from_filename
 from calibre.utils.config import prefs
 from calibre.gui2.dialogs.warning_ui import Ui_Dialog as Ui_WarningDialog
 
+class ProgressIndicator(QWidget):
+
+    def __init__(self, *args):
+        QWidget.__init__(self, *args)
+        self.setGeometry(0, 0, 300, 350)
+        self.movie = QMovie(':/images/jobs-animated.mng')
+        self.ml = QLabel(self)
+        self.ml.setMovie(self.movie)
+        self.movie.start()
+        self.movie.setPaused(True)
+        self.status = QLabel(self)
+        self.status.setWordWrap(True)
+        self.status.setAlignment(Qt.AlignHCenter|Qt.AlignTop)
+        self.status.font().setBold(True)
+        self.status.font().setPointSize(self.font().pointSize()+6)
+        self.setVisible(False)
+
+    def start(self, msg=''):
+        view = self.parent()
+        pwidth, pheight = view.size().width(), view.size().height()
+        self.resize(pwidth, min(pheight, 250))
+        self.move(0, (pheight-self.size().height())/2.)
+        self.ml.resize(self.ml.sizeHint())
+        self.ml.move(int((self.size().width()-self.ml.size().width())/2.), 0)
+        self.status.resize(self.size().width(), self.size().height()-self.ml.size().height()-10)
+        self.status.move(0, self.ml.size().height()+10)
+        self.status.setText(msg)
+        self.setVisible(True)
+        self.movie.setPaused(False)
+
+    def stop(self):
+        if self.movie.state() == self.movie.Running:
+            self.movie.setPaused(True)
+            self.setVisible(False)
+
+
 class WarningDialog(QDialog, Ui_WarningDialog):
-    
+
     def __init__(self, title, msg, details, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
@@ -31,20 +67,20 @@ class WarningDialog(QDialog, Ui_WarningDialog):
         self.details.setText(details)
 
 class FilenamePattern(QWidget, Ui_Form):
-    
+
     def __init__(self, parent):
         QWidget.__init__(self, parent)
         self.setupUi(self)
-        
+
         self.connect(self.test_button, SIGNAL('clicked()'), self.do_test)
         self.connect(self.re, SIGNAL('returnPressed()'), self.do_test)
         self.re.setText(prefs['filename_pattern'])
-        
+
     def do_test(self):
         try:
             pat = self.pattern()
         except Exception, err:
-            error_dialog(self, _('Invalid regular expression'), 
+            error_dialog(self, _('Invalid regular expression'),
                          _('Invalid regular expression: %s')%err).exec_()
             return
         mi = metadata_from_filename(qstring_to_unicode(self.filename.text()), pat)
@@ -56,49 +92,49 @@ class FilenamePattern(QWidget, Ui_Form):
             self.authors.setText(', '.join(mi.authors))
         else:
             self.authors.setText(_('No match'))
-            
+
         if mi.series:
             self.series.setText(mi.series)
         else:
             self.series.setText(_('No match'))
-            
+
         if mi.series_index is not None:
             self.series_index.setText(str(mi.series_index))
         else:
             self.series_index.setText(_('No match'))
-            
+
         self.isbn.setText(_('No match') if mi.isbn is None else str(mi.isbn))
-            
-    
+
+
     def pattern(self):
         pat = qstring_to_unicode(self.re.text())
         return re.compile(pat)
-    
+
     def commit(self):
         pat = self.pattern().pattern
         prefs['filename_pattern'] = pat
         return pat
-         
-            
-        
+
+
+
 
 class ImageView(QLabel):
-    
+
     MAX_WIDTH  = 400
     MAX_HEIGHT = 300
     DROPABBLE_EXTENSIONS = ('jpg', 'jpeg', 'gif', 'png', 'bmp')
-    
+
     @classmethod
     def paths_from_event(cls, event):
-        ''' 
-        Accept a drop event and return a list of paths that can be read from 
+        '''
+        Accept a drop event and return a list of paths that can be read from
         and represent files with extensions.
         '''
         if event.mimeData().hasFormat('text/uri-list'):
             urls = [qstring_to_unicode(u.toLocalFile()) for u in event.mimeData().urls()]
             urls = [u for u in urls if os.path.splitext(u)[1] and os.access(u, os.R_OK)]
             return [u for u in urls if os.path.splitext(u)[1][1:].lower() in cls.DROPABBLE_EXTENSIONS]
-        
+
     def dragEnterEvent(self, event):
         if int(event.possibleActions() & Qt.CopyAction) + \
            int(event.possibleActions() & Qt.MoveAction) == 0:
@@ -106,7 +142,7 @@ class ImageView(QLabel):
         paths = self.paths_from_event(event)
         if paths:
             event.acceptProposedAction()
-            
+
     def dropEvent(self, event):
         paths = self.paths_from_event(event)
         event.setDropAction(Qt.CopyAction)
@@ -118,19 +154,19 @@ class ImageView(QLabel):
                 event.accept()
                 self.emit(SIGNAL('cover_changed()'), paths, Qt.QueuedConnection)
                 break
-    
+
     def dragMoveEvent(self, event):
         event.acceptProposedAction()
-    
+
     def setPixmap(self, pixmap):
         QLabel.setPixmap(self, pixmap)
         width, height = fit_image(pixmap.width(), pixmap.height(), self.MAX_WIDTH, self.MAX_HEIGHT)[1:]
         self.setMaximumWidth(width)
-        self.setMaximumHeight(height) 
+        self.setMaximumHeight(height)
+
 
-        
 class LocationModel(QAbstractListModel):
-    
+
     def __init__(self, parent):
         QAbstractListModel.__init__(self, parent)
         self.icons = [QVariant(QIcon(':/library')),
@@ -146,19 +182,19 @@ class LocationModel(QAbstractListModel):
                          _('Click to see the list of books available on your computer'),
                          _('Click to see the list of books in the main memory of your reader'),
                          _('Click to see the list of books on the storage card in your reader')
-                         ]            
-        
+                         ]
+
     def rowCount(self, parent):
         return 1 + sum([1 for i in self.free if i >= 0])
-    
+
     def data(self, index, role):
-        row = index.row()    
+        row = index.row()
         data = NONE
         if role == Qt.DisplayRole:
             text = self.text[row]%(human_readable(self.free[row-1])) if row > 0 \
                             else self.text[row]%self.count
             data = QVariant(text)
-        elif role == Qt.DecorationRole:                
+        elif role == Qt.DecorationRole:
             data = self.icons[row]
         elif role == Qt.ToolTipRole:
             data = QVariant(self.tooltips[row])
@@ -168,60 +204,70 @@ class LocationModel(QAbstractListModel):
             font = QFont('monospace')
             font.setBold(row == self.highlight_row)
             data = QVariant(font)
+        elif role == Qt.ForegroundRole and row == self.highlight_row:
+            return QVariant(QApplication.palette().brush(
+                QPalette.HighlightedText))
+        elif role == Qt.BackgroundRole and row == self.highlight_row:
+            return QVariant(QApplication.palette().brush(
+                QPalette.Highlight))
+
         return data
-    
+
     def headerData(self, section, orientation, role):
         return NONE
-    
+
     def update_devices(self, cp=None, fs=[-1, -1, -1]):
         self.free[0] = fs[0]
         self.free[1] = max(fs[1:])
         if cp == None:
             self.free[1] = -1
-        self.reset()        
-        
-    def location_changed(self, row):
-        self.highlight_row = row
         self.reset()
 
+    def location_changed(self, row):
+        self.highlight_row = row
+        self.emit(SIGNAL('dataChanged(QModelIndex,QModelIndex)'),
+                self.index(0), self.index(self.rowCount(QModelIndex())-1))
+
 class LocationView(QListView):
-        
+
     def __init__(self, parent):
         QListView.__init__(self, parent)
         self.setModel(LocationModel(self))
         self.reset()
-        QObject.connect(self.selectionModel(), SIGNAL('currentChanged(QModelIndex, QModelIndex)'), self.current_changed)
-        self.setCursor(Qt.PointingHandCursor)      
-    
+        self.setCursor(Qt.PointingHandCursor)
+        self.currentChanged = self.current_changed
+
     def count_changed(self, new_count):
         self.model().count = new_count
         self.model().reset()
-    
+
     def current_changed(self, current, previous):
-        i = current.row()
-        location = 'library' if i == 0 else 'main' if i == 1 else 'card'
-        self.emit(SIGNAL('location_selected(PyQt_PyObject)'), location)
-        
+        if current.isValid():
+            i = current.row()
+            location = 'library' if i == 0 else 'main' if i == 1 else 'card'
+            self.emit(SIGNAL('location_selected(PyQt_PyObject)'), location)
+            self.model().location_changed(i)
+
     def location_changed(self, row):
         if 0 <= row and row <= 2:
             self.model().location_changed(row)
-                        
+
 class JobsView(TableView):
-    
+
     def __init__(self, parent):
         TableView.__init__(self, parent)
         self.connect(self, SIGNAL('doubleClicked(QModelIndex)'), self.show_details)
-        
+
     def show_details(self, index):
         row = index.row()
         job = self.model().row_to_job(row)
         d = DetailView(self, job)
         self.connect(self.model(), SIGNAL('output_received()'), d.update)
         d.exec_()
-            
+
 
 class FontFamilyModel(QAbstractListModel):
-    
+
     def __init__(self, *args):
         QAbstractListModel.__init__(self, *args)
         try:
@@ -232,10 +278,10 @@ class FontFamilyModel(QAbstractListModel):
             traceback.print_exc()
         self.families.sort()
         self.families[:0] = ['None']
-        
+
     def rowCount(self, *args):
         return len(self.families)
-    
+
     def data(self, index, role):
         try:
             family = self.families[index.row()]
@@ -247,52 +293,52 @@ class FontFamilyModel(QAbstractListModel):
         if role == Qt.FontRole:
             return QVariant(QFont(family))
         return NONE
-    
+
     def index_of(self, family):
         return self.families.index(family.strip())
-    
+
 
 class BasicListItem(QListWidgetItem):
-    
+
     def __init__(self, text, user_data=None):
         QListWidgetItem.__init__(self, text)
         self.user_data = user_data
-        
+
     def __eq__(self, other):
         if hasattr(other, 'text'):
             return self.text() == other.text()
         return False
 
 class BasicList(QListWidget):
-    
+
     def add_item(self, text, user_data=None, replace=False):
         item = BasicListItem(text, user_data)
-        
+
         for oitem in self.items():
             if oitem == item:
                 if replace:
                     self.takeItem(self.row(oitem))
                 else:
                     raise ValueError('Item already in list')
-            
+
         self.addItem(item)
-    
+
     def remove_selected_items(self, *args):
         for item in self.selectedItems():
             self.takeItem(self.row(item))
-    
+
     def items(self):
         for i in range(self.count()):
             yield self.item(i)
 
 
-            
+
 class PythonHighlighter(QSyntaxHighlighter):
 
     Rules = []
     Formats = {}
     Config = {}
-    
+
     KEYWORDS = ["and", "as", "assert", "break", "class", "continue", "def",
         "del", "elif", "else", "except", "exec", "finally", "for", "from",
         "global", "if", "import", "in", "is", "lambda", "not", "or",
@@ -308,7 +354,7 @@ class PythonHighlighter(QSyntaxHighlighter):
         "open", "ord", "pow", "property", "range", "reduce", "repr",
         "reversed", "round", "set", "setattr", "slice", "sorted",
         "staticmethod", "str", "sum", "super", "tuple", "type", "unichr",
-        "unicode", "vars", "xrange", "zip"] 
+        "unicode", "vars", "xrange", "zip"]
 
     CONSTANTS = ["False", "True", "None", "NotImplemented", "Ellipsis"]
 
@@ -317,7 +363,7 @@ class PythonHighlighter(QSyntaxHighlighter):
         super(PythonHighlighter, self).__init__(parent)
         if not self.Config:
             self.loadConfig()
-        
+
 
         self.initializeFormats()
 
@@ -356,7 +402,7 @@ class PythonHighlighter(QSyntaxHighlighter):
             if value.isEmpty():
                 value = default
             Config[name] = value
-    
+
         for name in ("window", "shell"):
             Config["%swidth" % name] = settings.value("%swidth" % name,
                     QVariant(QApplication.desktop() \
@@ -385,9 +431,9 @@ class PythonHighlighter(QSyntaxHighlighter):
     sys.stdout = codecs.getwriter("UTF8")(sys.stdout)""")
         setDefaultString("newfile", """\
     #!/usr/bin/env python
-    
+
     from __future__ import division
-    
+
     import sys
     """)
         Config["backupsuffix"] = settings.value("backupsuffix",
@@ -399,7 +445,7 @@ class PythonHighlighter(QSyntaxHighlighter):
                 QVariant(150)).toInt()[0]
         Config["maxlinestoscan"] = settings.value("maxlinestoscan",
                 QVariant(5000)).toInt()[0]
-        Config["pythondocpath"] = settings.value("pythondocpath", 
+        Config["pythondocpath"] = settings.value("pythondocpath",
                 QVariant("http://docs.python.org")).toString()
         Config["autohidefinddialog"] = settings.value("autohidefinddialog",
                 QVariant(True)).toBool()
@@ -512,7 +558,7 @@ class PythonHighlighter(QSyntaxHighlighter):
                 if i == -1:
                     i = text.length()
                     self.setCurrentBlockState(state)
-                self.setFormat(0, i + 3,     
+                self.setFormat(0, i + 3,
                                PythonHighlighter.Formats["string"])
             elif i > -1:
                 self.setCurrentBlockState(state)
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 28f861ae3a..fd80a722e5 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -226,7 +226,11 @@ class ResultCache(SearchQueryParser):
         Returns a list of affected rows or None if the rows are filtered.
         '''
         for id in ids:
-            self._data[id] = conn.get('SELECT * from meta WHERE id=?', (id,))[0]
+            try:
+                self._data[id] = conn.get('SELECT * from meta WHERE id=?',
+                        (id,))[0]
+            except IndexError:
+                return None
         try:
             return map(self.row, ids)
         except ValueError:
@@ -269,7 +273,7 @@ class ResultCache(SearchQueryParser):
             ans = cmp(self._data[x][9], self._data[y][9])
         if ans != 0: return ans
         return cmp(self._data[x][10], self._data[y][10])
-    
+
     def cmp(self, loc, x, y, str=True, subsort=False):
         try:
             ans = cmp(self._data[x][loc].lower(), self._data[y][loc].lower()) if str else\
@@ -279,7 +283,7 @@ class ResultCache(SearchQueryParser):
         if subsort and ans == 0:
             return cmp(self._data[x][11].lower(), self._data[y][11].lower())
         return ans
-    
+
     def sort(self, field, ascending, subsort=False):
         field = field.lower().strip()
         if field in ('author', 'tag', 'comment'):
@@ -733,7 +737,7 @@ class LibraryDatabase2(LibraryDatabase):
         self.refresh_ids([id])
         if notify:
             self.notify('metadata', [id])
-        
+
     def delete_book(self, id, notify=True):
         '''
         Removes book from the result cache and the underlying database.
@@ -751,7 +755,7 @@ class LibraryDatabase2(LibraryDatabase):
         self.data.books_deleted([id])
         if notify:
             self.notify('delete', [id])
-    
+
     def remove_format(self, index, format, index_is_id=False, notify=True):
         id = index if index_is_id else self.id(index)
         path = os.path.join(self.library_path, *self.path(id, index_is_id=True).split(os.sep))
@@ -925,14 +929,14 @@ class LibraryDatabase2(LibraryDatabase):
                                    (id, aid))
             except IntegrityError: # Sometimes books specify the same author twice in their metadata
                 pass
-        ss = authors_to_sort_string(authors)    
+        ss = authors_to_sort_string(authors)
         self.conn.execute('UPDATE books SET author_sort=? WHERE id=?',
                           (ss, id))
         self.conn.commit()
         self.data.set(id, FIELD_MAP['authors'],
-                      ','.join([a.replace(',', '|') for a in authors]), 
+                      ','.join([a.replace(',', '|') for a in authors]),
                       row_is_id=True)
-        self.data.set(id, FIELD_MAP['author_sort'], ss, row_is_id=True) 
+        self.data.set(id, FIELD_MAP['author_sort'], ss, row_is_id=True)
         self.set_path(id, True)
         if notify:
             self.notify('metadata', [id])
@@ -1159,7 +1163,7 @@ class LibraryDatabase2(LibraryDatabase):
         else:
             path = path_or_stream
         return run_plugins_on_import(path, format)
-    
+
     def add_books(self, paths, formats, metadata, uris=[], add_duplicates=True):
         '''
         Add a book to the database. The result cache is not updated.
@@ -1219,7 +1223,7 @@ class LibraryDatabase2(LibraryDatabase):
             aus = aus.decode(preferred_encoding, 'replace')
         title = mi.title if isinstance(mi.title, unicode) else \
                 mi.title.decode(preferred_encoding, 'replace')
-        obj = self.conn.execute('INSERT INTO books(title, uri, series_index, author_sort) VALUES (?, ?, ?, ?)', 
+        obj = self.conn.execute('INSERT INTO books(title, uri, series_index, author_sort) VALUES (?, ?, ?, ?)',
                           (title, None, series_index, aus))
         id = obj.lastrowid
         self.data.books_added([id], self.conn)
@@ -1568,3 +1572,4 @@ books_series_link      feeds
 
         return duplicates
 
+
diff --git a/src/calibre/libunrar.py b/src/calibre/libunrar.py
index 96ba08cea5..22f03731e8 100644
--- a/src/calibre/libunrar.py
+++ b/src/calibre/libunrar.py
@@ -25,7 +25,8 @@ if iswindows:
 else:
     Structure = _Structure
 if hasattr(sys, 'frozen') and iswindows:
-    _libunrar = cdll.LoadLibrary(os.path.join(os.path.dirname(sys.executable), 'unrar.dll'))
+    _libunrar = cdll.LoadLibrary(os.path.join(os.path.dirname(sys.executable),
+        'unrar.dll'))
 _libunrar = load_library(_librar_name, cdll)
 
 RAR_OM_LIST    = 0
@@ -95,7 +96,7 @@ class RARHeaderDataEx(Structure):
 
 # Define a callback function
 #CALLBACK_FUNC = CFUNCTYPE(c_int, c_uint, c_long, c_char_p, c_long)
-#def py_callback_func(msg, user_data, p1, p2):    
+#def py_callback_func(msg, user_data, p1, p2):
 #    return 0
 
 #callback_func = CALLBACK_FUNC(py_callback_func)
@@ -123,7 +124,7 @@ def _interpret_open_error(code, path):
     elif code == ERAR_EOPEN:
         msg = 'Cannot open ' + path
     return msg
-    
+
 def _interpret_process_file_error(code):
     msg = 'Unknown Error'
     if code == ERAR_UNKNOWN_FORMAT:
@@ -145,7 +146,7 @@ def _interpret_process_file_error(code):
     elif  code == ERAR_MISSING_PASSWORD:
         msg = 'Password is required.'
     return msg
-        
+
 def get_archive_info(flags):
     ios = StringIO()
     print >>ios, 'Volume:\t\t', 'yes' if (flags & 1) else 'no'
@@ -162,7 +163,7 @@ def get_archive_info(flags):
 def extract(path, dir):
     """
     Extract archive C{filename} into directory C{dir}
-    """    
+    """
     open_archive_data = RAROpenArchiveDataEx(ArcName=path, OpenMode=RAR_OM_EXTRACT, CmtBuf=None)
     arc_data = _libunrar.RAROpenArchiveEx(byref(open_archive_data))
     cwd = os.getcwd()
@@ -173,7 +174,7 @@ def extract(path, dir):
         if open_archive_data.OpenResult != 0:
             raise UnRARException(_interpret_open_error(open_archive_data.OpenResult, path))
         print 'Archive:', path
-        #print get_archive_info(open_archive_data.Flags)        
+        #print get_archive_info(open_archive_data.Flags)
         header_data = RARHeaderDataEx(CmtBuf=None)
         #_libunrar.RARSetCallback(arc_data, callback_func, mode)
         while True:
@@ -240,5 +241,5 @@ def extract_member(path, match=re.compile(r'\.(jpg|jpeg|gif|png)\s*$', re.I), na
                                 open(os.path.join(dir, *header_data.FileNameW.split('/')), 'rb').read()
             finally:
                 _libunrar.RARCloseArchive(arc_data)
-            
-    
+
+
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 6bfe665557..b680ecc304 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -40,6 +40,8 @@ entry_points = {
              'calibre-parallel   = calibre.parallel:main',
              'calibre-customize  = calibre.customize.ui:main',
              'pdfmanipulate      = calibre.ebooks.pdf.manipulate:main',
+             'fetch-ebook-metadata = calibre.ebooks.metadata.fetch:main',
+             'calibre-smtp = calibre.utils.smtp:main',
         ],
         'gui_scripts'    : [
             __appname__+' = calibre.gui2.main:main',
@@ -159,6 +161,7 @@ def setup_completion(fatal_errors):
         from calibre.ebooks.epub.from_comic import option_parser as comic2epub
         from calibre.ebooks.metadata.fetch import option_parser as fem_op
         from calibre.gui2.main import option_parser as guiop
+        from calibre.utils.smtp import option_parser as smtp_op
         any_formats = ['epub', 'htm', 'html', 'xhtml', 'xhtm', 'rar', 'zip',
              'txt', 'lit', 'rtf', 'pdf', 'prc', 'mobi', 'fb2', 'odt']
         f = open_file('/etc/bash_completion.d/libprs500')
@@ -193,6 +196,7 @@ def setup_completion(fatal_errors):
         f.write(opts_and_words('feeds2epub', feeds2epub, feed_titles))
         f.write(opts_and_words('feeds2mobi', feeds2mobi, feed_titles))
         f.write(opts_and_words('fetch-ebook-metadata', fem_op, []))
+        f.write(opts_and_words('calibre-smtp', smtp_op, []))
         f.write('''
 _prs500_ls()
 {
@@ -402,7 +406,7 @@ def post_install():
 
     if opts.save_manifest_to:
         open(opts.save_manifest_to, 'wb').write('\n'.join(manifest)+'\n')
-        
+
     from calibre.utils.config import config_dir
     if os.path.exists(config_dir):
         os.chdir(config_dir)
@@ -515,7 +519,7 @@ def setup_desktop_integration(fatal_errors):
             check_call('xdg-icon-resource install --size 128 calibre-gui.png calibre-gui', shell=True)
             render_svg(QFile(':/images/viewer.svg'), os.path.join(tdir, 'calibre-viewer.png'))
             check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
-            
+
             f = open('calibre-lrfviewer.desktop', 'wb')
             f.write(VIEWER)
             f.close()
@@ -543,6 +547,3 @@ main = post_install
 if __name__ == '__main__':
     post_install()
 
-
-
-
diff --git a/src/calibre/parallel.py b/src/calibre/parallel.py
index 3480a01a89..4969877da9 100644
--- a/src/calibre/parallel.py
+++ b/src/calibre/parallel.py
@@ -45,7 +45,7 @@ PARALLEL_FUNCS = {
         ('calibre.gui2.lrf_renderer.main', 'main', {}, None),
         
       'ebook-viewer'    :
-        ('calibre.gui2.viewer.main', 'main', {}, None),  
+        ('calibre.gui2.viewer.main', 'main', {}, None),
 
       'feeds2lrf'    :
         ('calibre.ebooks.lrf.feeds.convert_from', 'main', {}, 'notification'),
diff --git a/src/calibre/ptempfile.py b/src/calibre/ptempfile.py
index 8a1cac4a54..f850820749 100644
--- a/src/calibre/ptempfile.py
+++ b/src/calibre/ptempfile.py
@@ -13,7 +13,7 @@ def cleanup(path):
     try:
         import os
         if os.path.exists(path):
-            os.remove(path)            
+            os.remove(path)
     except:
         pass   
     
diff --git a/src/calibre/trac/plugins/download.py b/src/calibre/trac/plugins/download.py
index 014a26bff3..2f6dce0573 100644
--- a/src/calibre/trac/plugins/download.py
+++ b/src/calibre/trac/plugins/download.py
@@ -5,7 +5,7 @@ import re, textwrap
 
 DEPENDENCIES = [
             #(Generic, version, gentoo, ubuntu, fedora)
-            ('python', '2.5', None, None, None),
+            ('python', '2.6', None, None, None),
             ('setuptools', '0.6c5', 'setuptools', 'python-setuptools', 'python-setuptools-devel'),
             ('Python Imaging Library', '1.1.6', 'imaging', 'python-imaging', 'python-imaging'),
             ('libusb', '0.1.12', None, None, None),
@@ -18,11 +18,12 @@ DEPENDENCIES = [
             ('lxml', '2.1.5', 'lxml', 'python-lxml', 'python-lxml'),
             ('python-dateutil', '1.4.1', 'python-dateutil', 'python-dateutil', 'python-dateutil'),
             ('BeautifulSoup', '3.0.5', 'beautifulsoup', 'python-beautifulsoup', 'python-BeautifulSoup'),
+            ('dnspython', '1.6.0', 'dnspython', 'dnspython', 'dnspython', 'dnspython'),
             ]
-        
+
 
 class CoolDistro:
-    
+
     def __init__(self, name, title, prefix=''):
         self.title = title
         url = prefix + '/chrome/dl/images/%s_logo.png'
@@ -38,7 +39,7 @@ def get_linux_data(version='1.0.0'):
                         ('foresight', 'Foresight 2.1'),
                         ('ubuntu', 'Ubuntu Jaunty Jackalope'),
                         ]:
-        data['supported'].append(CoolDistro(name, title, 
+        data['supported'].append(CoolDistro(name, title,
                                         prefix='http://calibre.kovidgoyal.net'))
         data['dependencies'] = DEPENDENCIES
     return data
@@ -53,51 +54,51 @@ if __name__ == '__main__':
             return MarkupTemplate(raw).generate(**get_linux_data()).render('xhtml')
         index.exposed = True
     t = Test()
-    t.index()    
+    t.index()
     cherrypy.quickstart(t)
 else:
     from pkg_resources import resource_filename
-    
+
     from trac.core import Component, implements
     from trac.web.chrome import INavigationContributor, ITemplateProvider, add_stylesheet
     from trac.web.main import IRequestHandler
     from trac.util import Markup
-    
-    
-    
+
+
+
     DOWNLOAD_DIR = '/var/www/calibre.kovidgoyal.net/htdocs/downloads'
     MOBILEREAD = 'https://dev.mobileread.com/dist/kovid/calibre/'
-    
+
     class OS(dict):
         """Dictionary with a default value for unknown keys."""
         def __init__(self, dict):
             self.update(dict)
             if not dict.has_key('img'):
                 self['img'] = self['name']
-    
-        
+
+
     class Download(Component):
         implements(INavigationContributor, IRequestHandler, ITemplateProvider)
-        
+
         request_pat = re.compile(r'\/download$|\/download_\S+')
-        
+
         # INavigationContributor methods
         def get_active_navigation_item(self, req):
             return 'download'
-    
+
         def get_navigation_items(self, req):
             yield 'mainnav', 'download', Markup('<a href="/download">Get %s</a>'%(__appname__,))
-        
+
         def get_templates_dirs(self):
             return [resource_filename(__name__, 'templates')]
-        
+
         def get_htdocs_dirs(self):
             return [('dl', resource_filename(__name__, 'htdocs'))]
-    
+
         # IRequestHandler methods
         def match_request(self, req):
             return self.__class__.request_pat.match(req.path_info)
-    
+
         def process_request(self, req):
             add_stylesheet(req, 'dl/css/download.css')
             if req.path_info == '/download':
@@ -114,29 +115,29 @@ else:
                         return self.osx(req)
                     elif os == 'linux':
                         return self.linux(req)
-        
+
         def top_level(self, req):
             operating_systems = [
                 OS({'name' : 'windows', 'title' : 'Windows'}),
                 OS({'name' : 'osx', 'title' : 'OS X'}),
                 OS({'name' : 'linux', 'title' : 'Linux'}),
             ]
-            data = dict(title='Get ' + __appname__, 
+            data = dict(title='Get ' + __appname__,
                         operating_systems=operating_systems, width=200,
                         font_size='xx-large', top_level=True)
             return 'download.html', data, None
-        
+
         def version_from_filename(self):
             try:
                 return open(DOWNLOAD_DIR+'/latest_version', 'rb').read().strip()
             except:
                 return '0.0.0'
-        
+
         def windows(self, req):
             version = self.version_from_filename()
-            file = '%s-%s.exe'%(__appname__, version,)         
+            file = '%s-%s.exe'%(__appname__, version,)
             data = dict(version = version, name='windows',
-                installer_name='Windows installer', 
+                installer_name='Windows installer',
                 title='Download %s for windows'%(__appname__),
                 compatibility='%s works on Windows XP and Windows Vista.'%(__appname__,),
                 path=MOBILEREAD+file, app=__appname__,
@@ -145,7 +146,7 @@ else:
     <p>If you are using the <b>SONY PRS-500</b> and %(appname)s does not detect your reader, read on:</p>
     <blockquote>
     <p>
-    If you are using 64-bit windows, you're out of luck. 
+    If you are using 64-bit windows, you're out of luck.
     </p>
     <p>
     There may be a conflict with the USB driver from SONY. In windows, you cannot install two drivers
@@ -159,7 +160,7 @@ else:
     </ul>
     You can uninstall a driver by right clicking on it and selecting uninstall.
     </li>
-    <li>Once the drivers have been uninstalled, find the file prs500.inf (it will be in the 
+    <li>Once the drivers have been uninstalled, find the file prs500.inf (it will be in the
     driver folder in the folder in which you installed %(appname)s. Right click on it and
     select Install.</li>
     </ol>
@@ -167,12 +168,12 @@ else:
     </blockquote>
     '''%dict(appname=__appname__)))
             return 'binary.html', data, None
-        
+
         def osx(self, req):
             version = self.version_from_filename()
-            file = 'calibre-%s.dmg'%(version,) 
+            file = 'calibre-%s.dmg'%(version,)
             data = dict(version = version, name='osx',
-                installer_name='OS X universal dmg', 
+                installer_name='OS X universal dmg',
                 title='Download %s for OS X'%(__appname__),
                 compatibility='%s works on OS X Tiger and above.'%(__appname__,),
                 path=MOBILEREAD+file, app=__appname__,
@@ -180,57 +181,57 @@ else:
     u'''
     <ol>
     <li>Before trying to use the command line tools, you must run the app at least once. This will ask you for you password and then setup the symbolic links for the command line tools.</li>
-    <li>The app cannot be run from within the dmg. You must drag it to a folder on your filesystem (The Desktop, Applications, wherever).</li> 
+    <li>The app cannot be run from within the dmg. You must drag it to a folder on your filesystem (The Desktop, Applications, wherever).</li>
     <li>In order for localization of the user interface in your language, select your language in the preferences (by pressing u\2318+P) and select your language.</li>
     </ol>
     '''))
             return 'binary.html', data, None
-        
+
         def linux(self, req):
             data = get_linux_data(version=self.version_from_filename())
             return 'linux.html', data, None
-                                
-    
+
+
     LINUX_INSTALLER = textwrap.dedent(r'''
     import sys, os, shutil, tarfile, subprocess, tempfile, urllib2, re, stat
-    
+
     MOBILEREAD='https://dev.mobileread.com/dist/kovid/calibre/'
-    
+
     class TerminalController:
         BOL = ''             #: Move the cursor to the beginning of the line
         UP = ''              #: Move the cursor up one line
         DOWN = ''            #: Move the cursor down one line
         LEFT = ''            #: Move the cursor left one char
         RIGHT = ''           #: Move the cursor right one char
-        
+
         # Deletion:
         CLEAR_SCREEN = ''    #: Clear the screen and move to home position
         CLEAR_EOL = ''       #: Clear to the end of the line.
         CLEAR_BOL = ''       #: Clear to the beginning of the line.
         CLEAR_EOS = ''       #: Clear to the end of the screen
-        
+
         # Output modes:
         BOLD = ''            #: Turn on bold mode
         BLINK = ''           #: Turn on blink mode
         DIM = ''             #: Turn on half-bright mode
         REVERSE = ''         #: Turn on reverse-video mode
         NORMAL = ''          #: Turn off all modes
-        
+
         # Cursor display:
         HIDE_CURSOR = ''     #: Make the cursor invisible
         SHOW_CURSOR = ''     #: Make the cursor visible
-        
+
         # Terminal size:
         COLS = None          #: Width of the terminal (None for unknown)
         LINES = None         #: Height of the terminal (None for unknown)
-        
+
         # Foreground colors:
         BLACK = BLUE = GREEN = CYAN = RED = MAGENTA = YELLOW = WHITE = ''
-        
+
         # Background colors:
         BG_BLACK = BG_BLUE = BG_GREEN = BG_CYAN = ''
         BG_RED = BG_MAGENTA = BG_YELLOW = BG_WHITE = ''
-        
+
         _STRING_CAPABILITIES = """
         BOL=cr UP=cuu1 DOWN=cud1 LEFT=cub1 RIGHT=cuf1
         CLEAR_SCREEN=clear CLEAR_EOL=el CLEAR_BOL=el1 CLEAR_EOS=ed BOLD=bold
@@ -238,29 +239,29 @@ else:
         HIDE_CURSOR=cinvis SHOW_CURSOR=cnorm""".split()
         _COLORS = """BLACK BLUE GREEN CYAN RED MAGENTA YELLOW WHITE""".split()
         _ANSICOLORS = "BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE".split()
-        
+
         def __init__(self, term_stream=sys.stdout):
             # Curses isn't available on all platforms
             try: import curses
             except: return
-            
+
             # If the stream isn't a tty, then assume it has no capabilities.
             if not hasattr(term_stream, 'isatty') or not term_stream.isatty(): return
-            
+
             # Check the terminal type.  If we fail, then assume that the
             # terminal has no capabilities.
             try: curses.setupterm()
             except: return
-            
+
             # Look up numeric capabilities.
             self.COLS = curses.tigetnum('cols')
             self.LINES = curses.tigetnum('lines')
-            
+
             # Look up string capabilities.
             for capability in self._STRING_CAPABILITIES:
                 (attrib, cap_name) = capability.split('=')
                 setattr(self, attrib, self._tigetstr(cap_name) or '')
-            
+
             # Colors
             set_fg = self._tigetstr('setf')
             if set_fg:
@@ -278,7 +279,7 @@ else:
             if set_bg_ansi:
                 for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
                     setattr(self, 'BG_'+color, curses.tparm(set_bg_ansi, i) or '')
-        
+
         def _tigetstr(self, cap_name):
             # String capabilities can include "delays" of the form "$<2>".
             # For any modern terminal, we should be able to just ignore
@@ -286,19 +287,19 @@ else:
             import curses
             cap = curses.tigetstr(cap_name) or ''
             return re.sub(r'\$<\d+>[/*]?', '', cap)
-        
+
         def render(self, template):
             return re.sub(r'\$\$|\${\w+}', self._render_sub, template)
-        
+
         def _render_sub(self, match):
             s = match.group()
             if s == '$$': return s
             else: return getattr(self, s[2:-1])
-    
+
     class ProgressBar:
         BAR = '%3d%% ${GREEN}[${BOLD}%s%s${NORMAL}${GREEN}]${NORMAL}\n'
         HEADER = '${BOLD}${CYAN}%s${NORMAL}\n\n'
-        
+
         def __init__(self, term, header):
             self.term = term
             if not (self.term.CLEAR_EOL and self.term.UP and self.term.BOL):
@@ -308,7 +309,7 @@ else:
             self.bar = term.render(self.BAR)
             self.header = self.term.render(self.HEADER % header.center(self.width))
             self.cleared = 1 #: true if we haven't drawn the bar yet.
-            
+
         def update(self, percent, message=''):
             if isinstance(message, unicode):
                 message = message.encode('utf-8', 'ignore')
@@ -322,14 +323,14 @@ else:
             (self.bar % (100*percent, '='*n, '-'*(self.width-10-n))) +
             self.term.CLEAR_EOL + msg)
             sys.stdout.flush()
-        
+
         def clear(self):
             if not self.cleared:
                 sys.stdout.write(self.term.BOL + self.term.CLEAR_EOL +
                 self.term.UP + self.term.CLEAR_EOL +
                 self.term.UP + self.term.CLEAR_EOL)
                 self.cleared = 1
-    
+
     def download_tarball():
         try:
             pb  = ProgressBar(TerminalController(sys.stdout), 'Downloading calibre...')
@@ -354,14 +355,14 @@ else:
                 print '%d%%, '%int(percent*100),
         f.seek(0)
         return f
-    
+
     def extract_tarball(tar, destdir):
         print 'Extracting application files...'
         if hasattr(tar, 'read'):
             subprocess.check_call(['tar', 'xjf', tar.name, '-C', destdir])
         else:
             subprocess.check_call(['tar', 'xjf', tar, '-C', destdir])
-    
+
     def main():
         defdir = '/opt/calibre'
         destdir = raw_input('Enter the installation directory for calibre (Its contents will be deleted!)[%s]: '%defdir).strip()
@@ -371,12 +372,12 @@ else:
         if os.path.exists(destdir):
             shutil.rmtree(destdir)
         os.makedirs(destdir)
-        
+
         f = download_tarball()
-        
+
         print 'Extracting files to %s ...'%destdir
         extract_tarball(f, destdir)
         pi = os.path.join(destdir, 'calibre_postinstall')
         subprocess.call(pi, shell=True)
         return 0
-    ''')
\ No newline at end of file
+    ''')
diff --git a/src/calibre/translations/ar.po b/src/calibre/translations/ar.po
index 4e7563a9a7..af607d81c1 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: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-03-14 03:00+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "لا يفعل شيءً"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -136,27 +143,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "يقرأ الميتاداتا من الملفات %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "استخرج الغلاف من ملف الرسومات"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "إقرأ ميتاداتا لكتب في أرشيفات ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "إقرأ ميتاداتا لكتب في أرشيفات RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "ضبط الميتاداتا في الملفات %s"
 
@@ -224,17 +232,17 @@ msgstr "تعطيل الملحق المسمى"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "ليس للقارئ بطاقة تخزين."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "لا توجد مساحة كافية في بطاقة التخزين"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "لا توجد مساحة كافية في الذاكرة الرئيسية"
 
@@ -491,7 +499,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "لم يتمكّن من الحصول على كتاب داخل الأرشيف"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -502,14 +510,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "تم كتابة الخرج في "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "يجب أن تخصص ملف HTML لتدخيله"
 
@@ -530,88 +538,88 @@ msgstr ""
 "\t\tيوجد هناك الكثير من التوسيم. سيتم التقسيم بدون الاحتفاظ على التخطيط. قد "
 "يتسبب هذا بتصوير خاطئ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "تم كتابة الـHTML المنفّذ "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "دليل الخرج. الإفتراض هو الدليل الحالي."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr "ترميز الحروف لملفات HTML. الإفتراضي هو للكشف الآلي."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "تحكّم بالوصلات التالية في ملفات HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "ضبط الميتاداتا للكتاب المنشئ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "ضبط العنوان. الإفتراضي هو ما يكشف آلياً."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "مؤلفون الكتاب، قائمة مفرّقة بـ&."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "مواضيع الكتاب، قائمة مفرّقة بفاصلة."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "ضبط ناشر هذا الكتاب."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "تلخيص عن هذا الكتاب."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -632,7 +640,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "دليل الخرج. الإفتراضي هو الدليل الحالي."
 
@@ -647,7 +655,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "تم إنشاء كتاب OEB في"
 
@@ -690,9 +698,9 @@ msgid "Sort key for the author"
 msgstr "مفتاح الترتيب للمؤلف"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "الناشر"
 
@@ -1450,63 +1458,63 @@ msgstr "تحديد المؤلفين"
 msgid "Set the comment"
 msgstr "تحديد التعليق"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "العنوان"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "المؤلف أو المؤلفون"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "المنتج"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "التعليقات"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "الوسوم"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "السلسلة"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "اللغة"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "ختم التوقيت"
 
@@ -1622,7 +1630,7 @@ msgstr "تحديد اللغة"
 msgid "Set the ISBN"
 msgstr "تحديد الـISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1638,11 +1646,11 @@ msgstr "الاستخدام: rb-meta file.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "إنشاء ملف Mobipocket من EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1810,97 +1818,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr "التهيئة لاتسخدامها في حفظ ملفات لوحدها في القرص"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "تأكيد قبل الحذف"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "حجم أيقونات شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "إظهار تسميات الأزرار في شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "ترتيب الوسوم حسب الشهرة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "الإفتراضي للتحويل إلى LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "الخيارات لمستعرض كتب LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr "تهيئات التي تعرض عن طريق المستعرض الداخلي"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "إظهار أيقونة صينية النظام"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "رفع أخبار تم تنزيلها إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr "حذف كتب من المكتبة بعد رفعها إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr "تم إضافة %s إلى المكتبة"
@@ -1938,7 +1950,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "قراءة الميتاداتا..."
 
@@ -1946,43 +1958,183 @@ msgstr "قراءة الميتاداتا..."
 msgid "Searching in"
 msgstr "يتم البحث في"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "احصل على معلومات الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "احصل على قائمة الكتب على الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "ارسل الميتاداتا إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "رفع %d كتاب إلى الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "حذف كتب من الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "تنزيل الكتب من الجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "عرض كتاب على الجهاز"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "المسار"
@@ -1991,7 +2143,8 @@ msgstr "المسار"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2089,27 +2242,29 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr "تعطيل اقتصاص&"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " ملحقات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "متقدّم"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "عام"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "الواجهة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "متقدّم"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2117,117 +2272,164 @@ msgstr ""
 "محتوى\n"
 "خادم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "الملحقات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "مسار الملحق غير صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s ليس مسار لملحق صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "إختيار الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "لا يمكن تعطيل الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "الملحق: %s لا يمكن تعطيله"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "لا يمكن تخصيص الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "الملحق: %s لا يحتاج التخصيص"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "تخصيص %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "لم يمكن حذف الملحق المضمن"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " لا يمكن حذفه. هذا ملحق مضمن في البرنامج. حاول تعطيله بدلاً من حذفه."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "سجل الأخطاء:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "سجل النفاذ:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "فشل في تشغيل خادم المحتوى"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "حجم غير صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>يجب أن يكون دليل."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>يجب أن يكون دليل."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "إعدادات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2245,211 +2447,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "إقرأ ال&ميتاداتا من الملفات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " ثانية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "إختر ال&لغة (يحتاج إعادة تشغيل):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "عادي"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "مرتفع"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "منخفض"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "إضافة دليلاً إلى قائمة الدلائل المستخدمة كثيراً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "حذف الدليل من قائمة الدلائل المستخدمة كثيراً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "إرسال الأخبار& التي تم تنزيلها آلياً إلى قارئ الكتب الإلكترونية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "كبير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "متوسط"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "صغير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&حجم الأزرار على شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "إظهار النص& على أزرار شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "استخدم المستعرض& الداخلي في:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "&اسم المستخدم:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&كلمة السرّ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&ميتاداتا من اسم الملف"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "&اسم المستخدم:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&كلمة السرّ"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "إظهار& كلمة السرّ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2458,33 +2761,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "ت&خصيص الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "&حذف الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "إضافة ملحق جديد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&ملف الملحق:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&إضافة"
 
@@ -2512,7 +2815,7 @@ msgstr "حول %s إلى "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "ميتاداتا"
@@ -2566,26 +2869,26 @@ msgstr "إختار الغلاف لـ "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "لا يمكن القراءة"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "خطأ في قراءة الملف"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2595,7 +2898,7 @@ msgid " is not a valid picture"
 msgstr " ليست صورة صالحة"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "لا يمكن تحويله"
 
@@ -2918,47 +3221,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "ترتيب المؤلف"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "لم يتمكن من الشبك"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "لم يوجد ميتاداتا"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3287,58 +3596,76 @@ msgstr "حذف الت&هيئة:"
 msgid "A&utomatically set author sort"
 msgstr "ضبط& ترتيب المؤلف آلياً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3418,84 +3745,85 @@ msgstr "مخصّص"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr "تم جدولته"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "بحث"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr "الأثنين"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr "الأربعاء"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr "اليوم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr "الجمعة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr "السبت"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr "الأحد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr "الخميس"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "أنشأه: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr "آخر تنزيل"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "آخر تنزيل: لم ينزّل من قبل"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "جدولة تنزيل الأخبار"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3898,11 +4226,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3987,45 +4315,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "تاريخ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "التهيئة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -4054,7 +4386,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4101,148 +4433,129 @@ msgstr "فتح الكتب الإلكترونية"
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr "تبرع& لدعم كاليبر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "إعادة تشغيل&"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "تحرير الميتاداتا فردياً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "تحرير الميتاداتا جملةً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "إضافة كتب من دليل واحد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "حفظ إلى القرص"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "حفظ إلى القرص في دليل واحد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "عرض"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "عرض تهيئة معينة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "ضبط الإفتراضي في تحويل الرسومات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "الجهاز: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " تم كشفه."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "متصل "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4258,436 +4571,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "كتب EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "كتب LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "كتب HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "كتب LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "كتب MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "كتب نصّية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "كتب PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "الرسومات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "أرشيفات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr "الكتب المختارة <b>سوف تحذف تماماً</b> من حاسوبك. هل أنت متأكّد؟"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "لا يمكن تحرير الميتاداتا"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr "تم الحفظ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "إختيار دليل الوجهة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "قاعدة البيانات غير صالحة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "خطأ في الاتصال بالجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "خطأ في التحويل"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "تحديث متوفر"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "تحديث متوفر"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "كاليبر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "خرج:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "بحث متقدّم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&بحث:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "ترتيب حسب الش&هرة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "إضافة كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "حذف كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "تحرير معلومات الميتا"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "إرسال لجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "احصل على الأخبار"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "تحويل الكتاب الإلكتروني"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "كتب بنفس الوسوم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "التفضيلات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4873,84 +5151,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/مجهول"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "إختيار الكتاب الإلكتروني"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "كتب إلكترونية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "يتم تحميل الكتاب الإلكتروني..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "لم يتمكن من فتح الكتاب الإلكتروني"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5001,44 +5279,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5400,6 +5678,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5640,34 +5922,41 @@ msgstr "فشل تنزيل المقالة: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "الإسباني"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "كرواتي"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "الصربي"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5715,7 +6004,7 @@ msgstr "الإسباني"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5767,27 +6056,35 @@ msgstr "الإسباني"
 msgid "English"
 msgstr "الإنغليزي"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "الصربي"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "الإسباني"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "الفرنسي"
 
@@ -5796,6 +6093,10 @@ msgstr "الفرنسي"
 msgid "Dutch"
 msgstr "الهولندي"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5806,7 +6107,7 @@ msgstr "البرتغالي"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5817,10 +6118,6 @@ msgstr "ألماني"
 msgid "Kovid Goyal"
 msgstr "Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "كرواتي"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "إيطالي"
@@ -5860,6 +6157,9 @@ msgstr ""
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
+#~ msgid "Cannot connect"
+#~ msgstr "لم يتمكن من الشبك"
+
 #~ msgid "title"
 #~ msgstr "العنوان"
 
diff --git a/src/calibre/translations/bg.po b/src/calibre/translations/bg.po
index 96b2bd1802..5d566e8db9 100644
--- a/src/calibre/translations/bg.po
+++ b/src/calibre/translations/bg.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2008-05-24 06:23+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -134,27 +141,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -218,17 +226,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -481,14 +489,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -507,88 +515,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -609,7 +617,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -624,7 +632,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -665,9 +673,9 @@ msgid "Sort key for the author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr ""
 
@@ -1393,63 +1401,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1565,7 +1573,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1581,11 +1589,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1752,97 +1760,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1879,7 +1891,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1887,43 +1899,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -1932,7 +2084,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2030,143 +2183,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2184,211 +2386,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2397,33 +2700,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2451,7 +2754,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2505,26 +2808,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2534,7 +2837,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2855,47 +3158,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3214,58 +3523,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3345,84 +3672,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3820,11 +4148,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3909,45 +4237,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3976,7 +4308,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4023,148 +4355,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4180,436 +4493,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4795,84 +5073,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4923,44 +5201,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5319,6 +5597,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5556,34 +5838,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5631,7 +5920,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5683,20 +5972,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5704,6 +6000,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5712,6 +6009,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5722,7 +6023,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5733,10 +6034,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/translations/ca.po b/src/calibre/translations/ca.po
index 24d5f4c6eb..bd678322b4 100644
--- a/src/calibre/translations/ca.po
+++ b/src/calibre/translations/ca.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2008-05-24 06:21+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -25,13 +25,14 @@ msgid "Does absolutely nothing"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -48,21 +49,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -70,21 +73,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -221,17 +229,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -473,7 +481,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -484,14 +492,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -510,88 +518,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -612,7 +620,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -627,7 +635,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -670,9 +678,9 @@ msgid "Sort key for the author"
 msgstr "Clau d'ordre per a l'autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Editorial"
 
@@ -1439,63 +1447,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Tí­tol"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Comentaris"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Sèries"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Marca de temps"
 
@@ -1611,7 +1619,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1627,11 +1635,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1798,97 +1806,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Directoris emprats amb freqüència"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1925,7 +1937,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1933,43 +1945,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Envia a la memòria interna"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Envia a la targeta de memòria"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Sense espai al dispositiu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr "<p>No puc desar llibres al dispositiu perquè no hi ha espai restant "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Camí"
@@ -1978,7 +2130,8 @@ msgstr "Camí"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2076,143 +2229,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Ubicació de la base de dades no vàlida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Cal que siga un directori."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Ubicació de la base de dades no vàlida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Cal que siga un directori."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ubicació de la base de dades no vàlida.<br>No es pot escriure "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Configuració"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Cerca la nova ubicació de la base de dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2230,211 +2432,312 @@ msgstr "Cerca la nova ubicació de la base de dades"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Afegir el directori al llistat de directoris freqüents"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Elimiar el directori al llistat de directoris freqüents"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "Nom d'&usuari:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Contrasenya:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "Nom d'&usuari:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Contrasenya:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2443,33 +2746,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2497,7 +2800,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadades"
@@ -2551,26 +2854,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "No pot llegir-se"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "No tens permissos per a llegir l'arxiu: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Error llegint l'arxiu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Error llegint de l'arxiu: <br /><b>"
 
@@ -2580,7 +2883,7 @@ msgid " is not a valid picture"
 msgstr " no és una imatge vàlida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "No puc convertir-lo"
 
@@ -2904,50 +3207,54 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "No puc connectar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Cal especificar una clau d'accès vàlida per a isbndb.com"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Recull metadades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Recollint metadades per a <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Registreu-vos gratuïtament a <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> per a obtenir una clau d'accés."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3276,59 +3583,77 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "No puc aconseguir la coberta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Cal especificar un ISBN correcte per al llibre."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>No puc aconseguir la coberta.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Cal especificar un ISBN correcte per al llibre."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3408,84 +3733,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3883,11 +4209,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3972,45 +4298,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Grandària (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Valoració"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Cap"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Llibre <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -4039,7 +4369,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>No</b> s'han trobat coincidències per al text \"<i>%s</i>\"."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "No s'han trobat coincidències"
 
@@ -4086,148 +4416,129 @@ msgstr "Obre l'eBook"
 msgid "Configure"
 msgstr "Configura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Error en la comunicació amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Envia a la memòria interna"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Envia a la targeta de memòria"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Edita metadades individualment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Edita metadades en massa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Desa al disc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Mostra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Converteix individualment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Converteix tots"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4243,210 +4554,179 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Sense espai al dispositiu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr "<p>No puc desar llibres al dispositiu perquè no hi ha espai restant "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "No puc editar les meta-dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Cap llibre seleccionat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "No puc desar al disc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Cap llibre seleccionat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "No puc mostrar-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "No puc configurar-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "No puc configurar-lo amb treballs processant-se"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "No puc moure la base de dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Error comunicant amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4454,109 +4734,109 @@ msgstr ""
 "Hi ha hagut un error de comunicació amb el dispositiu. Lleve, torne a "
 "connectar el dispositiu i torne a iniciar el programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "Re&cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4564,7 +4844,7 @@ msgstr ""
 "Recerca llibres pel tí­tol o l'autor. <br><br>Els espais entre paraules es "
 "substitueixen per AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4572,113 +4852,109 @@ msgstr ""
 "Recerca llibres pel tí­tol, l'autor, l'editorial, les etiquetes i els "
 "comentaris<br><br>Els espais entre paraules es substitueixen per AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Reinicialitza la recerca ràpida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Afegeix llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Suprimeix llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Esborra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Edita la meta-informació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Envia al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Recull notí­cies (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Converteix Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4864,84 +5140,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4992,44 +5268,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5388,6 +5664,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5625,34 +5905,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5700,7 +5987,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5752,20 +6039,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5773,6 +6067,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5781,6 +6076,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5791,7 +6090,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5802,10 +6101,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
@@ -5894,6 +6189,22 @@ msgstr ""
 #~ msgid "&Location of books database (library1.db)"
 #~ msgstr "&Ubicació de la base de dades (library1.db)"
 
+#~ msgid "Cannot connect"
+#~ msgstr "No puc connectar"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Cal especificar una clau d'accès vàlida per a isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Recollint metadades per a <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Registreu-vos gratuïtament a <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> per a obtenir una clau d'accés."
+
 #~ msgid "&Access Key;"
 #~ msgstr "Clau d'&accés;"
 
diff --git a/src/calibre/translations/cs.po b/src/calibre/translations/cs.po
index cae407a157..7ce44b34fb 100644
--- a/src/calibre/translations/cs.po
+++ b/src/calibre/translations/cs.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-03-11 12:54+0000\n"
 "Last-Translator: raduz <raduzator@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Nedělá vůbec nic"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Načíst metadata ze souborů %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Vyjmout obálky ze souborů s komixy"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Načíst metadata z elektronických knih v ZIP archívech"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Načíst metadata z elektronických knih v RAR archívech"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -226,17 +234,17 @@ msgstr "Deaktivovat modul podle jména"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Do čtecího zařízení není vložena žádná paměťová karta."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Na paměťové kartě není dostatek volného místa"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "V hlavní paměti není dostatek volného místa"
 
@@ -539,7 +547,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "V archivu nebyl nalezen žádný ebook."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -556,14 +564,14 @@ msgstr ""
 "Pokud je místo HTML souboru specifikován OPF soubor, je převzat seznam \n"
 "odkazů z elementu <spine> v OPF souboru.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Výstup zapsán do "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Musíte specifikovat vstupní HTML soubor."
 
@@ -585,24 +593,24 @@ msgstr ""
 "\t\tPříliš mnoho tagů. Přerozděleno bez zachování struktury. To může "
 "způsobit nesprávné zobrazení."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Zpracované HTML bylo zapsano do "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Volby pro nastavení průchodu HTML souborem."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Výstupní adresář. Standardně je aktuální adresář."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr "Kódování znakové sady HTML souborů. Standardně je autodetekována."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -610,11 +618,11 @@ msgstr ""
 "Výstup je uložen do ZIP souboru. Pokud je zvolena tato volba, položka --"
 "output by měla obsahovat název souboru, nikoliv adresáře."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Nastavuje následovaní odkazů v HTML souborech."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -622,7 +630,7 @@ msgstr ""
 "Nastavuje procházení HTML souborů do šířky. Normálně je nastaveno procházení "
 "do hloubky."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -631,39 +639,39 @@ msgstr ""
 "nezáporné číslo. 0 znamená, že nejsou následovány žádné odkazy obsažené v "
 "HTML souboru."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Nastavit metadata pro generovanou knihu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Zadat název. Standardně je autodetekován."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "Autor(ři) knihy, oddělení ampersandy (&)."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Téma(ta) knihy jako seznam oddělený čárkami."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Zadat vydavatele této knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Shrnutí této knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Nahrát metadata ze zadaného OPF souboru."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Nastavení užitečná pro odlaďování."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -671,11 +679,11 @@ msgstr ""
 "Zobrazovat více informací při zpracování. Může být zadáno několikrát pro "
 "zvětšení množství informací."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr "Výstupní HTML je zobrazeno v podobě lépe čitelné pro člověka."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -703,7 +711,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LIT_soubor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Výstupní adresář. Standardně je použit aktuální adresář."
 
@@ -718,7 +726,7 @@ msgid "Useful for debugging."
 msgstr "Užitečné pro ladění programu."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB kniha vytvořena v"
 
@@ -761,9 +769,9 @@ msgid "Sort key for the author"
 msgstr "Třídící klíč pro autora"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Vydavatel"
 
@@ -1666,63 +1674,63 @@ msgstr "Zadejte autory"
 msgid "Set the comment"
 msgstr "Poznámka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Název"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(ři)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Komentáře"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Tagy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Série"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Jazyk:"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Časová značka"
 
@@ -1854,7 +1862,7 @@ msgstr "Nastavit jazyk"
 msgid "Set the ISBN"
 msgstr "Zadat ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Hodnota položky dc:language"
 
@@ -1870,11 +1878,11 @@ msgstr "Použití: rb-meta soubor.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "Vytvářím Mobipocket soubor z EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog  [možnosti]  kniha.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "Nezpracované MOBI HTML uložené do"
 
@@ -2060,99 +2068,103 @@ msgstr ""
 "\tOřeže PDF. \n"
 "\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "čato používané adresáře"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 "Formát, který má byt použit při ukládání jednotlivých souborů na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Vyžadovat potvrzení před smazáním"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Velikost ikon nástrojové lišty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Zobrazovat popisy tlačítek v panelu nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Uspořádání hlavního okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr "Upozornit když je k dipozici nová verze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "číslování knih v sérii římskými číslicemi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Třídit seznam tagů pode popularity"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Standadní nastavení převodu do formátu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 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:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 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:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "Nejstarší zprávy ponechané v databázi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Zobrazit ikonu v systémovém panelu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Odelsat stažené zpravy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 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:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 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:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr "Kniha %s byla přidána do knihovny"
@@ -2189,7 +2201,7 @@ msgid "Adding books to database..."
 msgstr "Přidávám knihy do databáze..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "Načítám metadata..."
 
@@ -2197,43 +2209,183 @@ msgstr "Načítám metadata..."
 msgid "Searching in"
 msgstr "Hledám v"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Zařízení už není připojené"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Získat informace o zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Získat seznam knih v zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Odeslat metadata do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Odeslat %d knih do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Smazat knihy ze zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Převzít knihy ze zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Zobrazit knihu v zařízení"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "podle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Cesta"
@@ -2242,7 +2394,8 @@ msgstr "Cesta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2340,27 +2493,29 @@ msgstr "Širo&ké"
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " moduly"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "podle"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Rozšířené"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Obecné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Rozšířené"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2368,104 +2523,151 @@ msgstr ""
 "Obsahový\n"
 "Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Moduly"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Chybí platná cesta k modulům"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s není platná cesta k modulům"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Zvolte modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "Modul není možné deaktivovat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "Modul %s nemůže být deaktivován"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Modul není upravitelný"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "Modul %s nevyžaduje žádné úpravy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Upravit %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "Vestavěný modul není možné odstranit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " nemůže být odstraněn. Je to vestavěbý modul. Skuste ho místo odstranění "
 "deaktivovat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Záznam o chybách:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Záznam o přístupu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Nepodařilo se spustit obdahový server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Neplatná velikost"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Velikost %s je neplatná. Požadovaný formát je šířka x výška"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Neplatné umístění databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Musí být adresář."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Neplatné umístění databáze "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Musí být adresář."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Neplatné umístění databáze. <br> Nemůžu zapsat do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Zkompaktňuji databázi. Tento proces může chvíli trvat."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Zkompaktňuji..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Zkompaktňuji databázi. Tento proces může chvíli trvat."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2473,16 +2675,16 @@ msgstr ""
 "&Umístění elektronických knih (Knihy jsou umístěné v adresářích podla autora "
 "a metadata jsou uložené v souboru metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Určete nové umístění databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2500,36 +2702,36 @@ msgstr "Určete nové umístění databáze"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Zobrazit upozornění když je k dispozici &nová verze."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Číst &metadata ze souborů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Formát pro uložení do jediného &souboru:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "Výchozí časový &limit sítě:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2537,111 +2739,224 @@ msgstr ""
 "Výchozí časový limit pro síťové dotazy (např. pokaždé když jdeme na Internet "
 "získat informace)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Vyberte &jazyk (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normální"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Vysoká"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Nízká"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "&Priorita úloh:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Přidat adresář do seznamu často používaných"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Odebrat adresář ze seznamu často používaných"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Číslovať knihy v sérii &Římskými číslicemi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Zobrazit &ikonu v sýstémové liště (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Zobrazit prohlížec &obálek v samostatném okně (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "&Automaticky odeslat stažené zprávy do čtecího zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "Smazat zprávy z knihovny po jejich o&deslání do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "Počet obálek zobraze&ných v přohlížecím módu (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Panel nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Velké"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Střední"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Malé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Velikost tlačítek na panelu nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Zobrazit &text na tlačítkách panelu nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Viditelné sloup&ce v seznamu knih v knihovne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Použít interní &prohlížec pro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "&Uživatelské jméno:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Heslo:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Uvolnit nepoužitý diskový prostor z databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "Z&kompaktnit databázi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadata ze souboru"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2651,23 +2966,11 @@ msgstr ""
 "pomocí internetového prohlížeče z jakehokoliv místa na světě. Změny v "
 "nastaení se projeví až po restartu serveru."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "&Port serveru:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "&Uživatelské jméno:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Heslo:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2675,13 +2978,13 @@ msgstr ""
 "Pokud ponecháte heslo prázdné, kdokoliv bude mít přístup k vaší zbírce knih "
 "přes webové rozhraní."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "Zobrazit he&slo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2689,31 +2992,31 @@ msgstr ""
 "Maximální velikost (šířka x výška) zobrazených obálek. Velké obálky budou "
 "zmenšené. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Max. velikost &obálek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "&Spustit server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "&Zastavit server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Test serveru"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "&Automaticky spustit server při startu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Zobrazit &serverové záznamy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2722,34 +3025,34 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 "Tady můžete upravit chování calibre, určením které moduly bude používat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr "Aktivovat/&Deaktivovat modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "&Upravit modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "&Odstranit modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "Přidat nový modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Soubor modulu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "Přid&at"
 
@@ -2777,7 +3080,7 @@ msgstr "Převést %s do formátu "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadata"
@@ -2836,26 +3139,26 @@ msgstr "Vyberte obálku pro "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Nemůžu přečíst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Nemáte přístupová práva na čtení souboru: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Chyba při čtení souboru"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Chyba při čtení souboru: <br /><b>"
 
@@ -2865,7 +3168,7 @@ msgid " is not a valid picture"
 msgstr " není platný obrazový soubor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Nemůžu převást"
 
@@ -3190,47 +3493,53 @@ msgstr "Název vygenerovaného &Obsahu"
 msgid "Level &3 TOC"
 msgstr "Obsah úrovně &3"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Autor (seřadit jako)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Spojení selhalo"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Musíte zadat platný přístupový kód pro isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Chyba přebírání metadat"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Nenalezeny žádné metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3549,58 +3858,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3680,84 +4007,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4155,11 +4483,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -4244,45 +4572,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Hodnocení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -4311,7 +4643,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4358,148 +4690,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4515,436 +4828,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Aktualizace dostupná"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Aktualizace dostupná"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5130,84 +5408,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5258,44 +5536,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5654,6 +5932,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5891,34 +6173,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5966,7 +6255,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6018,20 +6307,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -6039,6 +6335,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -6047,6 +6344,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6057,7 +6358,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6068,10 +6369,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
@@ -6111,6 +6408,15 @@ msgstr ""
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
+#~ msgid "Cannot connect"
+#~ msgstr "Spojení selhalo"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Musíte zadat platný přístupový kód pro isbndb.com"
+
+#~ msgid "Error fetching metadata"
+#~ msgstr "Chyba přebírání metadat"
+
 #~ msgid "The author(s) of the ebook, as a comma separated list."
 #~ msgstr "Autor/ři knihy v seznamu odděleném čárkou."
 
diff --git a/src/calibre/translations/da.po b/src/calibre/translations/da.po
new file mode 100644
index 0000000000..81f0af51d1
--- /dev/null
+++ b/src/calibre/translations/da.po
@@ -0,0 +1,6124 @@
+# Danish translation for calibre
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the calibre package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: calibre\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-25 12:12+0000\n"
+"Last-Translator: Clement Østergaard <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: 2009-03-27 02:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "Gør absolut ingenting"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:62
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:96
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:100
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:102
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:82
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1150
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:263
+#: /home/kovid/work/calibre/src/calibre/library/database.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:872
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:907
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1214
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1216
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1396
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1419
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/server.py:327
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:51
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Filtype"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Metadatalæser"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "Metadataskriver"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:74
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:84
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
+msgid "Read metadata from %s files"
+msgstr "Indlæs metadata fra %s filer"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
+msgid "Read metadata from ebooks in ZIP archives"
+msgstr "Læs metadata fra ebøger i zip-arkiver"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
+msgid "Read metadata from ebooks in RAR archives"
+msgstr "Læs metadata fra ebøger i rar-arkiver"
+
+#: /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:248
+msgid "Set metadata in %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr "installerede plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr "Deaktiverede plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr "Intet gyldigt plugin fundet i "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:185
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:262
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:268
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:270
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:272
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:274
+msgid "List all installed plugins"
+msgstr "Vis alle installerede plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:276
+msgid "Enable the named plugin"
+msgstr "Aktiver det angivne plugin"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+msgid "Disable the named plugin"
+msgstr "Deaktiver det angivne plugin"
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
+msgid "The reader has no storage card connected."
+msgstr "Læseren har ikke et hukommelseskort tilsluttet"
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
+msgid "There is insufficient free space on the storage card"
+msgstr "Der er ikke tilstrækkelig plads på hukommelseskortet"
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
+msgid "There is insufficient free space in main memory"
+msgstr "Der er ikke tilstrækkelig plads i hovedhukommelsen"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:168
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:195
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:231
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:258
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:94
+msgid "Options to control the conversion to EPUB"
+msgstr "Indstillinger for konvertering til EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+msgid ""
+"The output EPUB file. If not specified, it is derived from the input file "
+"name."
+msgstr ""
+"Navnet på outputfilen. Hvis det ikke er angivet, udledes det fra input "
+"filnavnet"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
+msgid ""
+"Profile of the target device this EPUB is meant for. Set to None to create a "
+"device independent EPUB. The profile is used for device specific "
+"restrictions on the EPUB. Choices are: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+msgid ""
+"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
+"existing CSS declarations in the source files."
+msgstr ""
+"Enten stien til et CSS stilark eller rå CSS. Dette CSS vil tilsidesætte "
+"enhver eksisterende CSS i kildefilerne"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+msgid "Control auto-detection of document structure."
+msgstr "Kontroller automatisk bestemmelse af dokumentets struktur"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:122
+msgid ""
+"An XPath expression to detect chapter titles. The default is to consider "
+"<h1> or\n"
+"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
+"\"part\" as chapter titles as \n"
+"well as any tags that have class=\"chapter\". \n"
+"The expression used must evaluate to a list of elements. To disable chapter "
+"detection,\n"
+"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
+"for further\n"
+"help on using this feature.\n"
+msgstr ""
+"Et XPath udtryk til genkending af kapiteloverskrifter. Den forvalgte "
+"indstilling betragter <h1> eller\n"
+"<h2> tags som indeholder ordene \"chapter\", \"book\", \"section\" eller "
+"\"part\" som kapiteloverskrifter, såvel \n"
+"som ethvert tag der har class=\"chapter\". \n"
+"Det benyttede udtryk skal evaluere til en liste med elementer. For at "
+"deaktivere kapitelbestemmelse,\n"
+"brug udtrykket \"/\". Se XPath gennemgangen i calibres brugermanual for "
+"yderligere\n"
+"hjælp om denne facilitet.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+msgid ""
+"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
+"page breaks before chapters. A value of \"rule\" will insert a line before "
+"chapters. A value of \"none\" will disable chapter marking and a value of "
+"\"both\" will use both page breaks and lines to mark chapters."
+msgstr ""
+"Angiv hvordan genkendte kapitler skal fremhæves. Værdien \"pagebreak\" vil "
+"indsætte sideskift før kapitler. Værdien \"rule\" vil indsætte en ny linje "
+"før kapitler. Værdien \"none\" vil deaktivere fremhævningen og værdien "
+"\"both\" vil bruge både side skift og linjer til fremhævning af kapitler."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
+msgid "Path to the cover to be used for this book"
+msgstr "Sti til omslaget der skal bruges til denne bog"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:142
+msgid ""
+"Use the cover detected from the source file in preference to the specified "
+"cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
+msgid ""
+"Remove the first image from the input ebook. Useful if the first image in "
+"the source file is a cover and you are specifying an external cover."
+msgstr ""
+"Fjern det første billede fra e-bogen. Brugbar hvis det første billede er et "
+"omslag og du angiver en eksternt omslag."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
+msgid ""
+"Turn off splitting at page breaks. Normally, input files are automatically "
+"split at every page break into two files. This gives an output ebook that "
+"can be parsed faster and with less resources. However, splitting is slow and "
+"if your source file contains a very large number of page breaks, you should "
+"turn off splitting on page breaks."
+msgstr ""
+"Deaktiver deling ved sideskift. Normalt bliver inputfiler automatisk delt i "
+"to filer ved sideskift. Dette giver en output e-bog, der kan fortolkes "
+"hurtigt og bruger færre ressourcer. Imidlertid tager opdelingen tid så hvis "
+"din kildefil indeholder et højt antal sideskift, bør du deaktivere deling "
+"ved sideskift."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
+msgid ""
+"XPath expression to detect page boundaries for building a custom pagination "
+"map, as used by AdobeDE. Default is not to build an explicit pagination map."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
+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 "
+"with 1."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:165
+msgid ""
+"Control the automatic generation of a Table of Contents. If an OPF file is "
+"detected\n"
+"and it specifies a Table of Contents, then that will be used rather than "
+"trying\n"
+"to auto-generate a Table of Contents.\n"
+msgstr ""
+"Kontrollerer den automatiske generering af indholdsfortegnelser. Hvis en OPF-"
+"fil er opdaget\n"
+"og den angiver en indholdsfortegnelse, vil den blive brugt i stedet for der "
+"bliver forsøgt\n"
+"at lave én automatisk.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:171
+msgid ""
+"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
+"is: %default. Links are only added to the TOC if less than the --toc-"
+"threshold number of chapters were detected."
+msgstr ""
+"Maksimalt antal links at indsætte i indholdsfortegnelsen. Sæt til 0 for at "
+"deaktivere. Standardværdien er: %default. Links tilføjes kun til "
+"indholdsfortegnelsen hvis mindre der er opdaget færre kapitler end --toc-"
+"threshold."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:175
+msgid "Don't add auto-detected chapters to the Table of Contents."
+msgstr "Tilføj ikke automatisk genkendte kapitler til indholdsfortegnelsen."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:177
+msgid ""
+"If fewer than this number of chapters is detected, then links are added to "
+"the Table of Contents. Default: %default"
+msgstr ""
+"Hvis færre end dette antal kapitler er genkendt, bliver links tilføjet til "
+"indholdsfortegnelsen. Standardværdi: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:180
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level one. If this is specified, it takes precedence over "
+"other forms of auto-detection."
+msgstr ""
+"XPath udtryk, der angiver alle tags, der skal tilføjes til "
+"indholdsfortegnelsen på første niveau. Hvis dette er angivet, tager det "
+"prioritet over andre former for auto-genkendelse."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:184
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level two. Each entry is added under the previous level one "
+"entry."
+msgstr ""
+"XPath udtryk, der angiver alle tags, der skal tilføjes til "
+"indholdsfortegnelsen på andet niveau. Hvert element bliver tilføjet under "
+"det foregående første niveau-element."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:188
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level three. Each entry is added under the previous level two "
+"entry."
+msgstr ""
+"XPath udtryk, der angiver alle tags, der skal tilføjes til "
+"indholdsfortegnelsen på tredje niveau. Hvert element bliver tilføjet under "
+"det foregående andet niveau-element."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:192
+msgid ""
+"Path to a .ncx file that contains the table of contents to use for this "
+"ebook. The NCX file should contain links relative to the directory it is "
+"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
+"an overview of the NCX format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:198
+msgid ""
+"Normally, if the source file already has a Table of Contents, it is used in "
+"preference to the auto-generated one. With this option, the auto-generated "
+"one is always used."
+msgstr ""
+"Hvis kildefilen allerede har en indholdsfortegnelse, vil den normalt blive "
+"anvendt i stedet for den auto-genererede. Med denne indstilling vil den auto-"
+"genererede altid blive brugt."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:202
+msgid "Control page layout"
+msgstr "Kontrollerer sidelayoutet"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:204
+msgid "Set the top margin in pts. Default is %default"
+msgstr "Sæt topmargen i punkter. Standardværdien er %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:206
+msgid "Set the bottom margin in pts. Default is %default"
+msgstr "Sæt bundmargen i punkter. Standardværdien er %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:208
+msgid "Set the left margin in pts. Default is %default"
+msgstr "Sæt venstremargen i punkter. Standardværdien er %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:210
+msgid "Set the right margin in pts. Default is %default"
+msgstr "Sæt højremargen i punkter. Standardværdien er %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:212
+msgid ""
+"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
+"rescaling of fonts."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:215
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:221
+msgid "Do not force text to be justified in output."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:223
+msgid ""
+"Remove table markup, converting it into paragraphs. This is useful if your "
+"source file uses a table to manage layout."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:226
+msgid ""
+"Preserve the HTML tag structure while splitting large HTML files. This is "
+"only neccessary if the HTML files contain CSS that uses sibling selectors. "
+"Enabling this greatly slows down processing of large HTML files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:232
+msgid "Print generated OPF file to stdout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:234
+msgid "Print generated NCX file to stdout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:237
+msgid "Keep intermediate files during processing by html2epub"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:239
+msgid ""
+"Extract the contents of the produced EPUB file to the specified directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:186
+msgid ""
+"%%prog [options] filename\n"
+"\n"
+"Convert any of a large number of ebook formats to a %s file. Supported "
+"formats are: %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:105
+msgid "Could not find an ebook inside the archive"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
+msgid ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Convert a HTML file to an EPUB ebook. Recursively follows links in the HTML "
+"file.\n"
+"If you specify an OPF file instead of an HTML file, the list of links is "
+"takes from\n"
+"the <spine> element of the OPF file.  \n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
+msgid "You must specify an input HTML file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/iterator.py:36
+msgid "%s format books are not supported"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:30
+msgid ""
+"Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:142
+msgid ""
+"\t\tToo much markup. Re-splitting without structure preservation. This may "
+"cause incorrect rendering."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
+msgid "Written processed HTML to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
+msgid "Options to control the traversal of HTML"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
+msgid "The output directory. Default is the current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
+msgid "Character encoding for HTML files. Default is to auto detect."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
+msgid ""
+"Create the output in a zip file. If this option is specified, the --output "
+"should be the name of a file not a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
+msgid "Control the following of links in HTML files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
+msgid ""
+"Traverse links in HTML files breadth first. Normally, they are traversed "
+"depth first"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
+msgid ""
+"Maximum levels of recursion when following links in HTML files. Must be non-"
+"negative. 0 implies that no links in the root HTML file are followed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
+msgid "Set metadata of the generated ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
+msgid "Set the title. Default is to autodetect."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
+msgid "The author(s) of the ebook, as a & separated list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+msgid "The subject(s) of this book, as a comma separated list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
+msgid "Set the publisher of this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
+msgid "A summary of this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
+msgid "Load metadata from the specified OPF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
+msgid "Options useful for debugging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
+msgid ""
+"Be more verbose while processing. Can be specified multiple times to "
+"increase verbosity."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
+msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
+msgid ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Follow all links in an HTML file and collect them into the specified "
+"directory.\n"
+"Also collects any resources like images, stylesheets, scripts, etc. \n"
+"If an OPF file is specified instead, the list of files in its <spine> "
+"element\n"
+"is used.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
+msgid "Creating LIT file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:892
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:898
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:901
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:731
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:578
+msgid "Useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
+msgid "OEB ebook created in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:725
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:728
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_feeds.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:575
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76
+msgid "Set the title. Default: filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:78
+msgid ""
+"Set the author(s). Multiple authors should be set as a comma separated list. "
+"Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+msgid "Set the comment."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
+msgid "Set the category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:85
+msgid "Sort key for the title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
+msgid "Sort key for the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
+msgid "Publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:91
+msgid "Path to file containing image to be used as cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:93
+msgid ""
+"If there is a cover graphic detected in the source file, use that instead of "
+"the specified cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:96
+msgid "Output file name. Default is derived from input filename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:550
+msgid ""
+"Render HTML tables as blocks of text instead of actual tables. This is "
+"neccessary if the HTML contains very large or complex tables."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:101
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:103
+msgid "Enable autorotation of images that are wider than the screen width."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:106
+msgid "Set the space between words in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:108
+msgid "Separate paragraphs by blank lines."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:110
+msgid "Add a header to all the pages with title and author."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:112
+msgid ""
+"Set the format of the header. %a is replaced by the author and %t by the "
+"title. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:114
+msgid "Add extra spacing below the header. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:116
+msgid ""
+"Override the CSS. Can be either a path to a CSS stylesheet or a string. If "
+"it is a string it is interpreted as CSS."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:118
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:120
+msgid ""
+"Minimum paragraph indent (the indent of the first line of a paragraph) in "
+"pts. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:122
+msgid ""
+"Increase the font size by 2 * FONT_DELTA pts and the line spacing by "
+"FONT_DELTA pts. FONT_DELTA can be a fraction.If FONT_DELTA is negative, the "
+"font size is decreased."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:127
+msgid ""
+"Render all content as black on white instead of the colors specified by the "
+"HTML or CSS."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:133
+msgid ""
+"Profile of the target device for which this LRF is being generated. The "
+"profile determines things like the resolution and screen size of the target "
+"device. Default: %s Supported profiles: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:139
+msgid "Left margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:141
+msgid "Right margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:143
+msgid "Top margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:145
+msgid "Bottom margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:147
+msgid ""
+"Render tables in the HTML as images (useful if the document has large or "
+"complex tables)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:149
+msgid ""
+"Multiply the size of text in rendered tables by this factor. Default is "
+"%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:154
+msgid ""
+"The maximum number of levels to recursively process links. A value of 0 "
+"means thats links are not followed. A negative value means that <a> tags are "
+"ignored."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:158
+msgid ""
+"A regular expression. <a> tags whose href matches will be ignored. Defaults "
+"to %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:162
+msgid "Don't add links to the table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:166
+msgid "Prevent the automatic detection chapters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:169
+msgid ""
+"The regular expression used to detect chapter titles. It is searched for in "
+"heading tags (h1-h6). Defaults to %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:172
+msgid ""
+"Detect a chapter beginning at an element having the specified attribute. The "
+"format for this option is tagname regexp,attribute name,attribute value "
+"regexp. For example to match all heading tags that have the attribute "
+"class=\"chapter\" you would use \"h\\d,class,chapter\". You can set the "
+"attribute to \"none\" to match only on tag names. So for example, to match "
+"all h2 tags, you would use \"h2,none,\". Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:174
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:184
+msgid ""
+"Force a page break before tags whose names match this regular expression."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:186
+msgid ""
+"Force a page break before an element having the specified attribute. The "
+"format for this option is tagname regexp,attribute name,attribute value "
+"regexp. For example to match all heading tags that have the attribute "
+"class=\"chapter\" you would use \"h\\d,class,chapter\". Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:189
+msgid "Add detected chapters to the table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:192
+msgid "Preprocess Baen HTML files to improve generated LRF."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:194
+msgid ""
+"You must add this option if processing files generated by pdftohtml, "
+"otherwise conversion will fail."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:196
+msgid "Use this option on html0 files from Book Designer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:199
+msgid ""
+"Specify trutype font families for serif, sans-serif and monospace fonts. "
+"These fonts will be embedded in the LRF file. Note that custom fonts lead to "
+"slower page turns. For example: --serif-family \"Times New Roman\"\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:207
+msgid "The serif family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:210
+msgid "The sans-serif family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:213
+msgid "The monospace family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:217
+msgid "Be verbose while processing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:219
+msgid "Convert to LRS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:221
+msgid ""
+"Minimize memory usage at the cost of longer processing times. Use this "
+"option if you are on a memory constrained machine."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:223
+msgid ""
+"Specify the character encoding of the source file. If the output LRF file "
+"contains strange characters, try changing this option. A common encoding for "
+"files from windows computers is cp-1252. Another common choice is utf-8. The "
+"default is to try and guess the encoding."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
+msgid "Converting from %s to LRF is not supported."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
+msgid ""
+"any2lrf [options] myfile\n"
+"\n"
+"Convert any ebook format into LRF. Supported formats are:\n"
+"LIT, RTF, TXT, HTML, EPUB, MOBI, PRC and PDF. any2lrf will also process a "
+"RAR or\n"
+"ZIP archive, looking for an ebook inside the archive.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
+msgid "No file to convert specified."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:225
+msgid "Rendered %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:228
+msgid "Failed %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+msgid ""
+"Failed to process comic: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:287
+msgid ""
+"Options to control the conversion of comics (CBR, CBZ) files into ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+msgid "Title for generated ebook. Default is to use the filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:22
+msgid ""
+"Path to output file. By default a file is created in the current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
+msgid "Number of colors for grayscale image conversion. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
+msgid ""
+"Disable normalize (improve contrast) color range for pictures. Default: False"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
+msgid "Maintain picture aspect ratio. Default is to fill the screen."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
+msgid "Disable sharpening."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
+msgid ""
+"Disable trimming of comic pages. For some comics, trimming might remove "
+"content as well as borders."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+msgid "Don't split landscape images into two portrait images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+msgid ""
+"Keep aspect ratio and scale image using screen height as image width for "
+"viewing in landscape mode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+msgid ""
+"Used for right-to-left publications like manga. Causes landscape pages to be "
+"split into portrait pages from right to left."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:317
+msgid ""
+"Enable Despeckle. Reduces speckle noise. May greatly increase processing "
+"time."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:319
+msgid ""
+"Don't sort the files found in the comic alphabetically by name. Instead use "
+"the order they were added to the comic."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:321
+msgid ""
+"Choose a profile for the device you are generating this file for. The "
+"default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
+"suitable for any reader with the same screen size. Choices are %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:20
+msgid ""
+"Be verbose, useful for debugging. Can be specified multiple times for "
+"greater verbosity."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:325
+msgid "Don't show progress bar."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:328
+msgid "Apply no processing to the image"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:333
+msgid ""
+"%prog [options] comic.cb[z|r]\n"
+"\n"
+"Convert a comic in a CBZ or CBR file to an ebook. \n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:393
+msgid "Output written to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:553
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_comic.py:35
+msgid "Rendering comic pages..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/epub/convert_from.py:17
+msgid ""
+"Usage: %prog [options] mybook.epub\n"
+"        \n"
+"        \n"
+"%prog converts mybook.epub to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:23
+msgid ""
+"%prog [options] mybook.fb2\n"
+"\n"
+"\n"
+"%prog converts mybook.fb2 to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:28
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:24
+msgid "Print generated HTML to stdout and quit."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:30
+msgid "Keep generated HTML files after completing conversion to LRF."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:20
+msgid "Options to control the behavior of feeds2disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:22
+msgid "Options to control the behavior of html2lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:44
+msgid "Fetching of recipe failed: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:321
+msgid "\tBook Designer file detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:323
+msgid "\tParsing HTML..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:346
+msgid "\tBaen file detected. Re-parsing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:362
+msgid "Written preprocessed HTML to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:380
+msgid "Processing %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:394
+msgid "\tConverting to BBeB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:540
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:553
+msgid "Could not parse file: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+msgid "%s is an empty file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:565
+msgid "Failed to parse link %s %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:609
+msgid "Cannot add link %s to TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
+msgid "Unable to process image %s. Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1003
+msgid "Unable to process interlaced PNG %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1018
+msgid ""
+"Could not process image: %s\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772
+msgid ""
+"An error occurred while processing a table: %s. Ignoring table markup."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
+msgid ""
+"Bad table:\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796
+msgid "Table has cell that is too large"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1826
+msgid ""
+"You have to save the website %s as an html file first and then run html2lrf "
+"on it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1869
+msgid "Could not read cover image: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1872
+msgid "Cannot read from: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1997
+msgid "Failed to process opf file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lit/convert_from.py:15
+msgid ""
+"Usage: %prog [options] mybook.lit\n"
+"\n"
+"\n"
+"%prog converts mybook.lit to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
+msgid ""
+"%prog book.lrf\n"
+"Convert an LRF file into an LRS (XML UTF-8 encoded) file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
+msgid "Output LRS file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
+msgid "Do not save embedded image and font files to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
+msgid "Parsing LRF..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
+msgid "Creating XML..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
+msgid "LRS written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:266
+msgid "Could not read from thumbnail file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:286
+msgid ""
+"%prog [options] file.lrs\n"
+"Compile an LRS file into an LRF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+msgid "Path to output file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:116
+msgid "Verbose processing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:291
+msgid "Convert LRS to LRS, useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:455
+msgid "Invalid LRF file. Could not set metadata."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:580
+msgid ""
+"%prog [options] mybook.lrf\n"
+"\n"
+"\n"
+"Show/edit the metadata in an LRF file.\n"
+"\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:587
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:43
+msgid "Set the book title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
+msgid "Set sort key for the title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
+msgid "Set the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
+msgid "Set sort key for the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:47
+msgid "The category this book belongs to. E.g.: History"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:598
+msgid "Path to a graphic that will be set as this files' thumbnail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:601
+msgid ""
+"Path to a txt file containing the comment to be stored in the lrf file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:605
+msgid "Extract thumbnail from LRF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:606
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:191
+msgid "Set the publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
+msgid "Set the book classification"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
+msgid "Set the book creator"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
+msgid "Set the book producer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613
+msgid "Set book ID"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/mobi/convert_from.py:43
+msgid ""
+"Usage: %prog [options] mybook.mobi|prc\n"
+"\n"
+"\n"
+"%prog converts mybook.mobi to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:48
+msgid "Could not find pdftohtml, check it is in your PATH"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:74
+msgid ""
+" is an image based PDF. Only conversion of text based PDFs is supported."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:93
+msgid ""
+"%prog [options] mybook.pdf\n"
+"\n"
+"\n"
+"%prog converts mybook.pdf to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:403
+msgid ""
+"Path to output directory in which to create the HTML file. Defaults to "
+"current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:405
+msgid "Be more verbose."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:417
+msgid "You must specify a single PDF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:21
+msgid ""
+"%prog [options] mybook.rtf\n"
+"\n"
+"\n"
+"%prog converts mybook.rtf to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:146
+msgid ""
+"This RTF file has a feature calibre does not support. Convert it to HTML and "
+"then convert it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:19
+msgid ""
+"%prog [options] mybook.txt\n"
+"\n"
+"\n"
+"%prog converts mybook.txt to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:45
+msgid "Set the authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:49
+msgid "Set the comment"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+msgid "Title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+msgid "Author(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
+msgid "Producer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
+msgid "Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
+msgid "Language"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
+msgid "Timestamp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+msgid "A comma separated list of tags to set"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:204
+msgid "The series to which this book belongs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:206
+msgid "The series index"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:208
+msgid "The book language"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:210
+msgid "Extract the cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54
+msgid "Usage:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:53
+msgid "Usage: imp-meta file.imp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:60
+msgid "No filename specified."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:97
+msgid ""
+"\n"
+"%prog [options] key\n"
+"\n"
+"Fetch metadata for books from isndb.com. You can specify either the \n"
+"books ISBN ID or its title and author. If you specify the title and author,\n"
+"then more than one book may be returned.\n"
+"\n"
+"key is the account key you generate after signing up for a free account from "
+"isbndb.com.\n"
+"\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108
+msgid "The ISBN ID of the book you want metadata for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
+msgid "The author whose book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
+msgid "The title of the book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114
+msgid "The publisher of the book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:46
+msgid "LibraryThing.com timed out. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
+msgid ""
+"Could not fetch cover as server is experiencing high load. Please try again "
+"later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:54
+msgid " not found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:57
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:88
+msgid "LibraryThing.com server error. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:66
+msgid ""
+"\n"
+"%prog [options] ISBN\n"
+"\n"
+"Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:43
+msgid "Usage: %s file.lit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:236
+msgid "Cover saved to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:187
+msgid "Set the subject tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:189
+msgid "Set the language"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:193
+msgid "Set the ISBN"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
+msgid "Set the dc:language field"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:58
+msgid "Usage: pdf-meta file.pdf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:59
+msgid "Usage: rb-meta file.rb"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_any.py:55
+msgid "Creating Mobipocket file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
+msgid "%prog [options] myebook.mobi"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
+msgid "Raw MOBI HTML saved in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:534
+msgid "Options to control the conversion to MOBI"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:541
+msgid "Mobipocket-specific options."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:543
+msgid ""
+"Compress file text using PalmDOC compression. Results in smaller files, but "
+"takes a long time to run."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:546
+msgid "Modify images to meet Palm device size limitations."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:548
+msgid "Title for any generated in-line table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:554
+msgid ""
+"When present, use the author sorting information for generating the "
+"Mobipocket author metadata."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:556
+msgid ""
+"Device renderer profiles. Affects conversion of font sizes, image rescaling "
+"and rasterization of tables. Valid profiles are: %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:561
+msgid "Source renderer profile. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:564
+msgid "Destination renderer profile. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:572
+msgid "[options]"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:590
+msgid "Unknown source profile %r"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:594
+msgid "Unknown destination profile %r"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:57
+msgid "The output directory. Defaults to the current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:822
+msgid "Cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:823
+msgid "Title Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+msgid "Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:825
+msgid "Index"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:826
+msgid "Glossary"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:827
+msgid "Acknowledgements"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:828
+msgid "Bibliography"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:829
+msgid "Colophon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:830
+msgid "Copyright"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:831
+msgid "Dedication"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:832
+msgid "Epigraph"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:833
+msgid "Foreword"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:834
+msgid "List of Illustrations"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:835
+msgid "List of Tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:836
+msgid "Notes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:837
+msgid "Preface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:838
+msgid "Main Text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:13
+msgid "Options to control the transformation of pdf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:24
+msgid "Number of pixels to crop from the left most x (default is %d) "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:26
+msgid "Number of pixels to crop from the left most y (default is %d) "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:28
+msgid "Number of pixels to crop from the right most x (default is %d) "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:30
+msgid "Number of pixels to crop from the right most y (default is %d)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:32
+msgid ""
+"A file generated by ghostscript which allows each page to be individually "
+"cropped [gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox > bounding] "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:38
+msgid ""
+"\t%prog [options] file.pdf\n"
+"\n"
+"\tCrops a pdf. \n"
+"\t"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
+msgid "Frequently used directories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
+msgid "Send file to storage card instead of main memory by default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
+msgid "The format to use when saving single files to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
+msgid "Confirm before deleting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
+msgid "Toolbar icon size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
+msgid "Show button labels in the toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
+msgid "Main window geometry"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
+msgid "Notify when a new version is available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+msgid "Use Roman numerals for series number"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
+msgid "Sort tags list by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
+msgid "Number of covers to show in the cover browsing mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
+msgid "Defaults for conversion to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+msgid "Options for the LRF ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
+msgid "Formats that are viewed using the internal viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
+msgid "Columns to be displayed in the book list"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Automatically launch content server on application startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Oldest news kept in database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
+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:66
+msgid "Disable notifications from the system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
+msgid "Added %s to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:162
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:224
+msgid ""
+"<p>Books with the same title as the following already exist in the database. "
+"Add them anyway?<ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:232
+msgid "Duplicates found!"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:146
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:147
+msgid "Searching for books in all sub-directories..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:176
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:193
+msgid "Searching in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
+msgid "Device no longer connected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
+msgid "Get device information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
+msgid "Get list of books on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+msgid "Send metadata to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
+msgid "Upload %d books to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
+msgid "Delete books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
+msgid "Download books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
+msgid "View book on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+msgid "Path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:52
+msgid "Dialog"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
+msgid "TextLabel"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
+msgid "&Previous"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
+msgid "&Next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
+msgid "Choose Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
+msgid "Set defaults for conversion of comics (CBR/CBZ files)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
+msgid "Set options for converting %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
+msgid "&Title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
+msgid "&Author(s):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
+msgid "&Number of Colors:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:540
+msgid "&Profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
+msgid "Disable &normalize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
+msgid "Keep &aspect ratio"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
+msgid "Disable &Sharpening"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
+msgid "&Landscape"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
+msgid "Don't so&rt"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101
+msgid "&Right to left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102
+msgid "De&speckle"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
+msgid "&Wide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
+msgid "Disable &Trimming"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
+msgid " plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid ""
+"Content\n"
+"Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
+msgid "Error log:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
+msgid "Access log:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
+msgid "Failed to start content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
+msgid "Invalid database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
+msgid "Invalid database location "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
+msgid "Invalid database location.<br>Cannot write to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
+msgid "Compacting..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+msgid "Configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
+msgid ""
+"&Location of ebooks (The ebooks are stored in folders sorted by author and "
+"metadata is stored in the file metadata.db)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
+msgid "Browse for the new database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
+msgid "..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
+msgid "Show notification when &new version is available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
+msgid ""
+"If you disable this setting, metadata is guessed from the filename instead. "
+"This can be configured in the Advanced section."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
+msgid "Read &metadata from files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
+msgid "Format for &single file save:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
+msgid "Default network &timeout:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
+msgid ""
+"Set the default timeout for network fetches (i.e. anytime we go out to the "
+"internet to get information)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
+msgid " seconds"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
+msgid "Choose &language (requires restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
+msgid "Normal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
+msgid "High"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
+msgid "Low"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
+msgid "Job &priority:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
+msgid "Add a directory to the frequently used directories list"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
+msgid "Remove a directory from the frequently used directories list"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
+msgid "Use &Roman numerals for series number"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
+msgid "Show &notifications in system tray"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
+msgid "Show cover &browser in a separate window (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
+msgid "&Number of covers to show in browse mode (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
+msgid "Toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
+msgid "Large"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
+msgid "Medium"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
+msgid "Small"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
+msgid "&Button size in toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
+msgid "Show &text in toolbar buttons"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
+msgid "Select visible &columns in library view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
+msgid "Use internal &viewer for:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
+msgid "Free unused diskspace from the database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
+msgid "&Compact database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
+msgid "&Metadata from file name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
+msgid ""
+"calibre contains a network server that allows you to access your book "
+"collection using a browser from anywhere in the world. Any changes to the "
+"settings will only take effect after a server restart."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
+msgid "Server &port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
+msgid ""
+"If you leave the password blank, anyone will be able to access your book "
+"collection using the web interface."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
+msgid "&Show password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
+msgid "&Start Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
+msgid "St&op Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
+msgid "&Test Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
+msgid "Run server &automatically on startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
+msgid "View &server logs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
+msgid ""
+"If you want to use the content server to access your ebook collection on "
+"your iphone with Stanza, you will need to add the URL "
+"http://myhostname:8080/stanza as a new catalog in the stanza reader on your "
+"iphone. Here myhostname should be the fully qualified hostname or the IP "
+"address of this computer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
+msgid "ERROR"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:52
+msgid "Bulk convert to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:54
+msgid "Convert %s to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+msgid "Metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
+msgid "Look & Feel"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
+msgid "Page Setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300
+msgid "Chapter Detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
+msgid ""
+"Specify metadata such as title and author for the book.\n"
+"\n"
+"Metadata will be updated in the database as well as the generated %s file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
+msgid ""
+"Adjust the look of the generated ebook by specifying things like font sizes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
+msgid "Specify the page layout settings like margins."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300
+msgid "Fine tune the detection of chapter and section headings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167
+msgid "Choose cover for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
+msgid "Cannot read"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
+msgid "You do not have permission to read the file: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
+msgid "Error reading file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
+msgid "<p>There was an error reading from file: <br /><b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:190
+msgid " is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:243
+msgid "This book has no available formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:93
+msgid "No available formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:94
+msgid "Cannot convert %s as this book has no supported formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:253
+msgid "Choose the format to convert to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:265
+msgid "Invalid XPath expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:266
+msgid "The expression %s is invalid. Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:467
+msgid "Convert to EPUB"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
+msgid "Book Cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+msgid "Change &cover image:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+msgid "Browse for an image to use as the cover of this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:500
+msgid "Use cover from &source file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:330
+msgid "&Title: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:331
+msgid "Change the title of this book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:334
+msgid "&Author(s): "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
+msgid ""
+"Change the author(s) of this book. Multiple authors should be separated by "
+"an &. If the author name contains an &, use && to represent it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:505
+msgid "Author So&rt:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:506
+msgid ""
+"Change the author(s) of this book. Multiple authors should be separated by a "
+"comma"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:343
+msgid "&Publisher: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:480
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+msgid "Change the publisher of this book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:481
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:344
+msgid "Ta&gs: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:345
+msgid ""
+"Tags categorize the book. This is particularly useful while searching. "
+"<br><br>They can be any words or phrases, separated by commas."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:483
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:348
+msgid "&Series:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:484
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:350
+msgid "List of known series. You can add new series."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:486
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+msgid "Series index."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
+msgid "Book "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:524
+msgid "Source en&coding:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
+msgid "Base &font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:512
+msgid " pt"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:493
+msgid "Remove &spacing between paragraphs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:494
+msgid "Preserve &tag structure when splitting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:495
+msgid "&Rescale images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:496
+msgid "&Ignore tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:497
+msgid "&Use author sort to set author field in output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:498
+msgid "No text &justification"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:499
+msgid "&Linearize tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:500
+msgid "Remove &first image from source file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:501
+msgid "Override &CSS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:503
+msgid "&Source profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:504
+msgid "&Destination profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:541
+msgid "&Left Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:543
+msgid "&Right Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:545
+msgid "&Top Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:547
+msgid "&Bottom Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:513
+msgid "Do not &split on page breaks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:514
+msgid "&Page map"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:515
+msgid ""
+"<p>You can control how calibre detects page boundaries using a XPath "
+"expression. To learn how to use XPath expressions see the <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">XPath "
+"tutorial</a>. The page boundaries are useful only if you want a mapping from "
+"pages in a paper book, to locations in the e-book. This controls where Adobe "
+"Digital Editions displays the page numbers in the right margin.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:516
+msgid "&Boundary XPath:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:517
+msgid "&Name XPath:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:518
+msgid "Automatic &chapter detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:519
+msgid ""
+"<p>You can control how calibre detects chapters using a XPath expression. To "
+"learn how to use XPath expressions see the <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">XPath "
+"tutorial</a></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:520
+msgid "&XPath:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:521
+msgid "Chapter &mark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:522
+msgid "Automatic &Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:523
+msgid "Number of &links to add to Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:524
+msgid "Do not add &detected chapters to the Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:525
+msgid "Chapter &threshold"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:526
+msgid "&Force use of auto-generated Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:527
+msgid "Level &1 TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:528
+msgid "Level &2 TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:529
+msgid "&Title for generated TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:530
+msgid "Level &3 TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
+msgid "Author Sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
+msgid "ISBN"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
+msgid "No metadata found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
+msgid ""
+"No metadata found, try adjusting the title and author or the ISBN key."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
+msgid "Fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
+msgid ""
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
+msgid "&Access Key:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:81
+msgid "Fetch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:82
+msgid "Matches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:83
+msgid ""
+"Select the book that most closely matches your copy from the list below"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
+msgid "Details of job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:27
+msgid "Unavailable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:38
+msgid " - Jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:38
+msgid "Active Jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:39
+msgid "&Stop selected job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:98
+msgid "Choose the format to convert into LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:106
+msgid "Convert %s to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:360
+msgid "Set conversion defaults"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:341
+msgid "No preprocessing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:261
+msgid ""
+"Preprocess the file before converting to LRF. This is useful if you know "
+"that the file is from a specific source. Known sources:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:262
+msgid "<ol><li><b>baen</b> - Books from BAEN Publishers</li>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:263
+msgid ""
+"<li><b>pdftohtml</b> - HTML files that are the output of the program "
+"pdftohtml</li>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:264
+msgid "<li><b>book-designer</b> - HTML0 files from Book Designer</li>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
+msgid ""
+"Specify metadata such as title and author for the book.<p>Metadata will be "
+"updated in the database as well as the generated LRF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
+msgid ""
+"Adjust the look of the generated LRF file by specifying things like font "
+"sizes and the spacing between words."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
+msgid ""
+"Specify the page settings like margins and the screen size of the target "
+"device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:309
+msgid "<font color=\"gray\">No help available</font>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:412
+msgid "Bulk convert ebooks to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:494
+msgid "Convert to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:495
+msgid "Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:528
+msgid " pts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
+msgid "Embedded Fonts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
+msgid "&Serif:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
+msgid "S&ans-serif:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
+msgid "&Monospace:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:525
+msgid "Minimum &indent:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
+msgid "&Word spacing:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:529
+msgid "Enable auto &rotation of images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:530
+msgid "Insert &blank lines between paragraphs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:531
+msgid "Ignore &tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:532
+msgid "Ignore &colors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:533
+msgid "&Preprocess:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:534
+msgid "Header"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:535
+msgid "&Show header"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:536
+msgid "&Header format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:109
+msgid " px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:538
+msgid "Header &separation:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:539
+msgid "Override<br>CSS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:549
+msgid "&Convert tables to images (good for large/complex tables)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:550
+msgid "&Multiplier for text size in rendered tables:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:551
+msgid "Title based detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:552
+msgid "&Disable chapter detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:553
+msgid "&Regular expression:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:554
+msgid "Add &chapters to table of contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:555
+msgid "Don't add &links to the table of contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:556
+msgid "Tag based detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:557
+msgid "&Page break before tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:558
+msgid "&Force page break before tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:559
+msgid "Force page break before &attribute:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:560
+msgid "Detect chapter &at tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:561
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+msgid "Edit Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:329
+msgid "Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:335
+msgid "Author S&ort: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:336
+msgid ""
+"Specify how the author(s) of this book should be sorted. For example Charles "
+"Dickens should be sorted as Dickens, Charles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:339
+msgid "&Rating:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:341
+msgid "Rating of this book. 0-5 stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:342
+msgid " stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+msgid "Add Ta&gs: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:347
+msgid "Open Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+msgid "&Remove tags:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+msgid "Comma separated list of tags to remove from the books. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+msgid "Remove &format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "No format selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
+msgid "Could not read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
+msgid "Could not read metadata from %s format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
+msgid "Could not read cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
+msgid "Could not read cover from %s format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
+msgid "The cover in the %s format is invalid"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
+msgid ""
+"<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
+"do not have one, you can <a href='http://www.librarything.com'>register</a> "
+"for free!.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
+msgid "Cannot fetch cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
+msgid "<b>Could not fetch cover.</b><br/>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
+msgid "Edit Meta Information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:332
+msgid "Swap the author and title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:337
+msgid ""
+"Automatically create the author sort entry based on the current author entry"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:351
+msgid "Remove unused series (Series that have no books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+msgid "IS&BN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+msgid "&Fetch metadata from server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
+msgid "Available Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+msgid "Add a new format for this book to the database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
+msgid "Remove the selected formats for this book from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
+msgid "Set the cover for the book from the selected format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+msgid "Reset cover to default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
+msgid "Fetch &cover image from server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+msgid ""
+"Change the username and/or password for your account at LibraryThing.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+msgid "Change &password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
+msgid "Password needed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:43
+msgid "Aborting..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:40
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:138
+msgid "Custom"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
+msgid "Scheduled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
+msgid "Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "Monday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "Tuesday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "Wednesday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "day"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Friday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Saturday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Sunday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Thursday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
+msgid "Must set account information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
+msgid "This recipe requires a username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+msgid "%d days, %d hours and %d minutes ago"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+msgid "Last downloaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
+msgid "Last downloaded: never"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
+msgid "Schedule news download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
+msgid "Add a custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:816
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:820
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1135
+msgid "News"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+msgid "Recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:164
+msgid "Schedule for download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:165
+msgid "blurb"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:166
+msgid "&Schedule for download:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:169
+msgid "Every "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:168
+msgid "at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:170
+msgid ""
+"Interval at which to download this recipe. A value of zero means that the "
+"recipe will be downloaded every hour."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+msgid " days"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:172
+msgid "&Account"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:176
+msgid "For the scheduling to work, you must leave calibre running."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:177
+msgid "&Download now"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:178
+msgid ""
+"Delete downloaded news older than the specified number of days. Set to zero "
+"to disable."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:180
+msgid "Delete downloaded news older than "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:96
+msgid "Form"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
+msgid "contains"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
+msgid "The text to search for. It is interpreted as a regular expression."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38
+msgid ""
+"<p>Negate this match. That is, only return results that <b>do not</b> match "
+"this query."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
+msgid "Negate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:88
+msgid "Advanced Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:89
+msgid "Find entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:90
+msgid "&All these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:91
+msgid "This exact &phrase:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:92
+msgid "&One or more of these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:93
+msgid "But dont show entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:94
+msgid "Any of these &unwanted words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:95
+msgid ""
+"See the <a href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-"
+"search-interface\">User Manual</a> for more help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+msgid "A&vailable tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+msgid ""
+"Delete tag from database. This will unapply the tag from all books and then "
+"remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+msgid "Apply tag to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+msgid "A&pplied tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+msgid "Unapply (remove) tag from current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+msgid "&Add tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+msgid ""
+"If the tag you want is not in the available list, you can add it here. "
+"Accepts a comma separated list of tags."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+msgid "Add tag to available tags and apply it to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:62
+msgid "No recipe selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:68
+msgid "The attached file: %s is a recipe to download %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
+msgid "Recipe for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+msgid "Switch to Advanced mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:99
+msgid "Switch to Basic mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:109
+msgid "Feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:110
+msgid "The feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:114
+msgid "Feed must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:115
+msgid "The feed %s must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:120
+msgid "Already exists"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:121
+msgid "This feed has already been added to the recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+msgid "Invalid input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+msgid "<p>Could not create recipe. Error:<br>%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+msgid "Replace recipe?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+msgid "A custom recipe named %s already exists. Do you want to replace it?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:201
+msgid "Pick recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:201
+msgid "Pick the recipe to customize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+msgid "Choose a recipe file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+msgid "Add custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+msgid "Available user recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+msgid "Add/Update &recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+msgid "&Remove recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+msgid "&Share recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+msgid "Customize &builtin recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+msgid "&Load recipe from file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Create a basic news "
+"recipe, by adding RSS feeds to it. <br />For most feeds, you will have to "
+"use the \"Advanced mode\" to further customize the fetch "
+"process.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+msgid "Recipe &title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+msgid "&Oldest article:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+msgid "The oldest article to download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+msgid "&Max. number of articles per feed:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+msgid "Maximum number of articles to download per feed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+msgid "Feeds in recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+msgid "Remove feed from recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+msgid "Add feed to recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+msgid "&Feed title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+msgid "Feed &URL:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+msgid "&Add feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+msgid ""
+"For help with writing advanced news recipes, please visit <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+msgid "Recipe source code (python)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:97
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Set a regular expression "
+"pattern to use when trying to guess ebook metadata from filenames. </p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">A <a "
+"href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+"decoration: underline; color:#0000ff;\">reference</span></a> on the syntax "
+"of regular expressions is available.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" "
+"font-weight:600;\">Test</span> functionality below to test your regular "
+"expression on a few sample filenames. The group names for the various "
+"metadata entries are documented in tooltips.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:104
+msgid "Regular &expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:105
+msgid "&Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
+msgid "File &name:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
+msgid "Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:108
+msgid "Title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:109
+msgid "Regular expression (?P&lt;title&gt;)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
+msgid "No match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111
+msgid "Authors:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112
+msgid "Regular expression (?P<authors>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+msgid "Series:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+msgid "Regular expression (?P<series>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
+msgid "Series index:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
+msgid "Regular expression (?P<series_index>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+msgid "ISBN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+msgid "Regular expression (?P<isbn>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:46
+msgid "Job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:47
+msgid "Status"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:48
+msgid "Progress"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:49
+msgid "Running time"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:65
+msgid "Unknown job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:70
+msgid "Finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:72
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:74
+msgid "Waiting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:76
+msgid "Working"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
+msgid "Cannot kill job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
+msgid "Cannot kill jobs that communicate with the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
+msgid "Job has already run"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
+msgid "Size (MB)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
+msgid "Date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+msgid "Rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+msgid "None"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
+msgid "Book <font face=\"serif\">%s</font> of %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
+msgid "Configure Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
+msgid "Use white background"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
+msgid "Hyphenate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:50
+msgid "<b>Changes will only take effect after a restart.</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:64
+msgid " - LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
+msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
+msgid "No matches found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
+msgid "LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
+msgid "Parsing LRF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
+msgid "LRF Viewer toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
+msgid "Next Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
+msgid "Previous Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+msgid "Back"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+msgid "Forward"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
+msgid "Next match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
+msgid "Open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
+msgid "Configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
+msgid "&Restore"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
+msgid "&Donate to support calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
+msgid ""
+"<p>For help visit <a "
+"href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
+msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+msgid "Save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
+msgid "Set defaults for conversion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
+msgid "Set defaults for conversion of comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
+msgid "Bad database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
+msgid "Choose a location for your ebook library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
+msgid "Browse by covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
+msgid "Device database corrupted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
+msgid ""
+"\n"
+"                <p>The database of books on the reader is corrupted. Try the "
+"following:\n"
+"                <ol>\n"
+"                <li>Unplug the reader. Wait for it to finish regenerating "
+"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+"it should work with %(app)s. If not try the next step.</li>\n"
+"                <li>Quit %(app)s. Find the file media.xml in the reader's "
+"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+"file. Re-connect it and start %(app)s.</li>\n"
+"                </ol>\n"
+"                "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
+msgid "Saving to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
+msgid "Saved"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+msgid ""
+"<p>Could not save the following books to disk, because the %s format is not "
+"available for them:<ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
+msgid "Could not save some ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
+msgid "%s has no available formats."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
+msgid "Cannot configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
+msgid "Cannot configure while there are running jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
+msgid "Copying database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+msgid "Copying library to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
+msgid "Invalid database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+msgid ""
+"<p>An invalid database already exists at %s, delete it before trying to move "
+"the existing database.<br>Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
+msgid "Could not move database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
+msgid "No detailed info available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+msgid "No detailed information is available for books on the device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
+msgid "Conversion Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
+msgid ""
+"<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
+"first remove the DRM using 3rd party tools."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
+msgid "Invalid library location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
+msgid "Could not access %s. Using %s as the library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
+msgid ""
+"is the result of the efforts of many volunteers from all over the world. If "
+"you find it useful, please consider donating to support its development."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
+msgid "There are active jobs. Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
+msgid ""
+" is communicating with the device!<br>\n"
+"                      'Quitting may cause corruption on the device.<br>\n"
+"                      'Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
+msgid "WARNING: Active jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+msgid ""
+"will keep running in the system tray. To close it, choose <b>Quit</b> in the "
+"context menu of the system tray."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
+msgid ""
+"<span style=\"color:red; font-weight:bold\">Latest version: <a "
+"href=\"%s\">%s</a></span>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
+msgid ""
+"%s has been updated to version %s. See the <a "
+"href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
+"Visit the download page?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
+msgid "Use the library located at the specified path."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
+msgid "Start minimized to system tray."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
+msgid "Log debugging information to console"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
+msgid "calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
+msgid ""
+"Set the output format that is used when converting ebooks and downloading "
+"news"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+msgid "Advanced search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+msgid "Alt+S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+msgid "&Search:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+msgid ""
+"Search the list of books by title or author<br><br>Words separated by spaces "
+"are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+msgid ""
+"Search the list of books by title, author, publisher, tags and "
+"comments<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+msgid "Reset Quick Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Sort by &popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Add books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Remove books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
+msgid "Del"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+msgid "Edit meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+msgid "E"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+msgid "Send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+msgid "S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+msgid "Fetch news"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+msgid "F"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+msgid "Convert E-books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+msgid "C"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+msgid "V"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+msgid "Books with the same tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
+msgid "Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+msgid "Configure calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
+msgid "Ctrl+P"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:18
+msgid ""
+"Redirect console output to a dialog window (both stdout and stderr). Useful "
+"on windows where GUI apps do not have a output streams."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:57
+msgid "&Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:58
+msgid "&Quit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:84
+msgid "ERROR: Unhandled exception"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
+msgid "Click to browse books by their covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
+msgid "Click to turn off Cover Browsing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+msgid ""
+"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+"module failed:<br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:167
+msgid "Click to browse books by tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Publishers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:117
+msgid "Convert book: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:151
+msgid "Convert comic: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:267
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:335
+msgid "Convert book %d of %d (%s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:344
+msgid ""
+"<p>Could not convert %d of %d books, because no suitable source format was "
+"found.<ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:345
+msgid "Could not convert some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:387
+msgid "Fetch news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:384
+msgid "You must set a username and password for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:101
+msgid "Configure Ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:102
+msgid "&Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:103
+msgid "Se&rif family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:104
+msgid "&Sans family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:105
+msgid "&Monospace family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:106
+msgid "&Default font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:108
+msgid "Monospace &font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:110
+msgid "S&tandard font:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:111
+msgid "Serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:112
+msgid "Sans-serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:113
+msgid "Monospace"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:114
+msgid "&User stylesheet"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:50
+msgid "Options to customize the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:86
+msgid ""
+"Set the user CSS stylesheet. This can be used to customize the look of all "
+"books."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
+msgid "Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
+msgid "The serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:63
+msgid "The sans-serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:65
+msgid "The monospaced font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:66
+msgid "The standard font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:67
+msgid "The monospaced font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:68
+msgid "The standard font type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
+msgid "Go to..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
+msgid "Position in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+msgid "/Unknown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
+msgid "Go to a reference. To get reference numbers, use the reference mode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+msgid "Search for text in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
+msgid "Choose ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
+msgid "Ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+msgid "Add bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+msgid "Enter title for bookmark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
+msgid "No matches found for: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
+msgid "Loading flow..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
+msgid "Laying out %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
+msgid "Loading ebook..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
+msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
+msgid "DRM Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
+msgid "Could not open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
+msgid "<b>%s</b><br/><p>%s</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
+msgid "Options to control the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
+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:592
+msgid ""
+"%prog [options] file\n"
+"\n"
+"View an ebook.  \n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+msgid "Ebook Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+msgid "toolBar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+msgid "Next page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+msgid "Previous page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+msgid "Font size larger"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+msgid "Font size smaller"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
+msgid "Find next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
+msgid "Copy to clipboard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
+msgid "Reference Mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
+msgid "Bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+msgid "Invalid regular expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+msgid "Invalid regular expression: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
+msgid ""
+"Reader\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
+msgid ""
+"Card\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
+msgid "Click to see the list of books available on your computer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
+msgid "Click to see the list of books in the main memory of your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+msgid "Click to see the list of books on the storage card in your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
+msgid "Settings to control the calibre content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
+msgid "The port on which to listen. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:22
+msgid "The server timeout in seconds. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
+msgid "The max number of worker threads to use. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:28
+msgid "Username for access. By default, it is: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:107
+msgid ""
+"Path to the calibre library. Default is to use the path stored in the "
+"settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:187
+msgid ""
+"%prog list [options]\n"
+"\n"
+"List the books available in the calibre database.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:195
+msgid ""
+"The fields to display when listing books in the database. Should be a comma "
+"separated list of fields.\n"
+"Available fields: %s\n"
+"Default: %%default. The special field \"all\" can be used to select all "
+"fields. Only has effect in the text output format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:197
+msgid ""
+"The field by which to sort the results.\n"
+"Available fields: %s\n"
+"Default: %%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:199
+msgid "Sort results in ascending order"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:201
+msgid ""
+"Filter the results by the search query. For the format of the search query, "
+"please see the search related documentation in the User Manual. Default is "
+"to do no filtering."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:203
+msgid ""
+"The maximum width of a single line in the output. Defaults to detecting "
+"screen size."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:204
+msgid "The string used to separate fields. Default is a space."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:205
+msgid ""
+"The prefix for all file paths. Default is the absolute path to the library "
+"folder."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:208
+msgid ""
+"The format in which to output the data. Available choices: %s. Defaults is "
+"text."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:216
+msgid "Invalid fields. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:223
+msgid "Invalid sort field. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:294
+msgid ""
+"The following books were not added as they already exist in the database "
+"(see --duplicates option):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:320
+msgid ""
+"%prog add [options] file1 file2 file3 ...\n"
+"\n"
+"Add the specified files as books to the database. You can also specify "
+"directories, see\n"
+"the directory related options below.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
+msgid ""
+"Assume that each directory has only a single logical book and that all files "
+"in it are different e-book formats of that book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:331
+msgid "Process directories recursively"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:333
+msgid ""
+"Add books to database even if they already exist. Comparison is done based "
+"on book titles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:338
+msgid "You must specify at least one file to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:356
+msgid ""
+"%prog remove ids\n"
+"\n"
+"Remove the books identified by ids from the database. ids should be a comma "
+"separated list of id numbers (you can get id numbers by using the list "
+"command). For example, 23,34,57-85\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:368
+msgid "You must specify at least one book to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:388
+msgid ""
+"%prog add_format [options] id ebook_file\n"
+"\n"
+"Add the ebook in ebook_file to the available formats for the logical book "
+"identified by id. You can get id by using the list command. If the format "
+"already exists, it is replaced.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:399
+msgid "You must specify an id and an ebook file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:404
+msgid "ebook file must have an extension"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:412
+msgid ""
+"\n"
+"%prog remove_format [options] id fmt\n"
+"\n"
+"Remove the format fmt from the logical book identified by id. You can get id "
+"by using the list command. fmt should be a file extension like LRF or TXT or "
+"EPUB. If the logical book does not have fmt available, do nothing.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:425
+msgid "You must specify an id and a format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
+msgid ""
+"\n"
+"%prog show_metadata [options] id\n"
+"\n"
+"Show the metadata stored in the calibre database for the book identified by "
+"id.\n"
+"id is an id number from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:451
+msgid "Print metadata in OPF form (XML)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:456
+msgid "You must specify an id"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:470
+msgid ""
+"\n"
+"%prog set_metadata [options] id /path/to/metadata.opf\n"
+"\n"
+"Set the metadata stored in the calibre database for the book identified by "
+"id\n"
+"from the OPF file metadata.opf. id is an id number from the list command. "
+"You\n"
+"can get a quick feel for the OPF format by using the --as-opf switch to the\n"
+"show_metadata command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:483
+msgid "You must specify an id and a metadata file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:495
+msgid ""
+"%prog export [options] ids\n"
+"\n"
+"Export the books specified by ids (a comma separated list) to the "
+"filesystem.\n"
+"The export operation saves all formats of the book, its cover and metadata "
+"(in\n"
+"an opf file). You can get id numbers from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:503
+msgid "Export all books in database, ignoring the list of ids."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:505
+msgid "Export books to the specified directory. Default is"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:507
+msgid "Export all books into a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:509
+msgid "Create file names as author - title instead of title - author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:514
+msgid "You must specify some ids or the %s option"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:524
+msgid ""
+"%%prog command [options] [arguments]\n"
+"\n"
+"%%prog is the command line interface to the calibre books database.\n"
+"\n"
+"command is one of:\n"
+"  %s\n"
+"\n"
+"For help on an individual command: %%prog command --help\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
+msgid "<p>Copying books to %s<br><center>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1252
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1361
+msgid "Copying <b>%s</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1332
+msgid "<p>Migrating old database to ebook library in %s<br><center>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1378
+msgid "Compacting database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server.py:141
+msgid "Password to access your calibre library. Username is "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server.py:401
+msgid ""
+"[options]\n"
+"\n"
+"Start the calibre content server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/parallel.py:388
+msgid "Could not launch worker process."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/parallel.py:814
+msgid "Job stopped by user"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:43
+msgid "%sUsage%s: %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:81
+msgid "Created by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
+msgid "Path to the database in which books are stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+msgid "Pattern to guess metadata from filenames"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:540
+msgid "Access key for isbndb.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:542
+msgid "Default timeout for network operations (seconds)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:544
+msgid "Path to directory in which your library of books is stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:546
+msgid "The language in which to display the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:548
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:550
+msgid "Read metadata from files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:552
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:180
+msgid "Could not initialize the fontconfig library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
+msgid "URL must have the scheme sftp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
+msgid "host must be of the form user@hostname"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
+msgid "Failed to negotiate SSH session: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
+msgid "Failed to authenticate with server: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
+msgid "Unknown feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:145
+msgid "Untitled article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:15
+msgid "Options to control the fetching of periodical content from the web."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:18
+msgid "Customize the download engine"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:460
+msgid ""
+"Timeout in seconds to wait for a response from the server. Default: %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:468
+msgid ""
+"Minimum interval in seconds between consecutive fetches. Default is %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:470
+msgid ""
+"The character encoding for the websites you are trying to download. The "
+"default is to try and guess the encoding."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:472
+msgid ""
+"Only links that match this regular expression will be followed. This option "
+"can be specified multiple times, in which case as long as a link matches any "
+"one regexp, it will be followed. By default all links are followed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+msgid ""
+"Any link that matches this regular expression will be ignored. This option "
+"can be specified multiple times, in which case as long as any regexp matches "
+"a link, it will be ignored.By default, no links are ignored. If both --"
+"filter-regexp and --match-regexp are specified, then --filter-regexp is "
+"applied first."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:476
+msgid "Do not download CSS stylesheets."
+msgstr "Download ikke CSS stilark"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:33
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:90
+msgid ""
+"Specify a list of feeds to download. For example: \n"
+"\"['http://feeds.newsweek.com/newsweek/TopNews', "
+"'http://feeds.newsweek.com/headlines/politics']\"\n"
+"If you specify this option, any argument to %prog is ignored and a default "
+"recipe is used to download the feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:37
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:94
+msgid "Be more verbose while processing."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:39
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:96
+msgid ""
+"The title for this recipe. Used as the title for any ebooks created from the "
+"downloaded feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:41
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:97
+msgid "Username for sites that require a login to access content."
+msgstr ""
+"Brugernavn for sider, der kræver et login for at få adgang til indholdet"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:98
+msgid "Password for sites that require a login to access content."
+msgstr ""
+"Adgangskode for sider, der kræver login for at få adgang til indholdet"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:51
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:101
+msgid ""
+"Number of levels of links to follow on webpages that are linked to from "
+"feeds. Defaul %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:103
+msgid ""
+"The directory in which to store the downloaded feeds. Defaults to the "
+"current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:55
+msgid "Don't show the progress bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:57
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:107
+msgid "Very verbose output, useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:59
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:109
+msgid ""
+"Useful for recipe development. Forces max_articles_per_feed to 2 and "
+"downloads at most 2 feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:63
+msgid ""
+"%%prog [options] ARG\n"
+"\n"
+"%%prog parses an online source of articles, like an RSS or ATOM feed and \n"
+"fetches the article contents organized in a nice hierarchy.\n"
+"\n"
+"ARG can be one of:\n"
+"\n"
+"file name            - %%prog will try to load a recipe from the file\n"
+"\n"
+"builtin recipe title - %%prog will load the builtin recipe and use it to "
+"fetch the feed. For e.g. Newsweek or \"The BBC\" or \"The New York Times\"\n"
+"\n"
+"recipe as a string   - %%prog will load the recipe directly from the string "
+"arg.\n"
+"\n"
+"Available builtin recipes are:\n"
+"%s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:87
+msgid ""
+"Options to control web2disk (used to fetch websites linked from feeds)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:105
+msgid "Dont show the progress bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:120
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:684
+msgid "Fetching feeds..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
+msgid "Unknown News Source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:563
+msgid "Download finished"
+msgstr "Download færdig"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+msgid "Failed to download the following articles:"
+msgstr "Kunne ikke downloade følgende artikler:"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:567
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:573
+msgid " from "
+msgstr " fra "
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:571
+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:575
+msgid "\tFailed links:"
+msgstr "\tMislykkede links:"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:663
+msgid "Could not fetch article. Run with --debug to see the reason"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:688
+msgid "Got feeds from index page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+msgid "Trying to download cover..."
+msgstr "Prøver at downloade omslag..."
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+msgid "Starting download [%d thread(s)]..."
+msgstr "Starter download [%d tråd(e)]..."
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:763
+msgid "Feeds downloaded to %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+msgid "Could not download cover: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:780
+msgid "Downloading cover from %s"
+msgstr "Downloader omslag fra %s"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:913
+msgid "Untitled Article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:968
+msgid ""
+"\n"
+"Downloaded article %s from %s\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+msgid "Article downloaded: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:980
+msgid "Failed to download article: %s from %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
+msgid "Article download failed: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
+msgid "Fetching feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Kroatisk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Serbisk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_atlantic.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_barrons.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_bbc.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_business_week.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chr_mon.py:11
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cnn.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_common_dreams.py:8
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_daily_mail.py:6
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_discover_magazine.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dna.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ecogeek.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_economist.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_endgadget.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_espn.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_exiled.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_financial_times.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_forbes.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_freakonomics.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_fudzilla.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glasgow_herald.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_guardian.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_harpers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_harpers_full.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_iht.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_indy_star.py:6
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_irish_times.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_japan_times.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jpost.py:8
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py:44
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_latimes.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linux_magazine.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linuxdevices.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lrb.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_news_times.py:7
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_newsweek.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm_int.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nytimes.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_outlook_india.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_physics_today.py:11
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_physics_world.py:8
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politico.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_portfolio.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_reuters.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_science_aas.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_science_news.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sciencedaily.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_scientific_american.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_security_watch.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_shacknews.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_smh.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_soldiers.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegel_int.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py:20
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_starbulletin.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_teleread.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_age.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_nation.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_oz.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_register.py:6
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_scotsman.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_themarketticker.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_theonion.py:20
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_time_magazine.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_times_online.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_upi.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_usatoday.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_utne.py:20
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wash_post.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wikinews_en.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_winsupersite.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wired.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wsj.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_xkcd.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zdnet.py:17
+msgid "English"
+msgstr "Engelsk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Spansk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
+msgid "French"
+msgstr "Fransk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_de_standaard.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_demorgen_be.py:16
+msgid "Dutch"
+msgstr "Hollandsk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr "Bosnisk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
+msgid "Portugese"
+msgstr "Portugisisk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_faznet.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
+msgid "German"
+msgstr "Tysk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:12
+msgid "Kovid Goyal"
+msgstr "Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
+msgid "Italian"
+msgstr "Italiensk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:83
+msgid "Skipping duplicated article: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:88
+msgid "Skipping filtered article: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
+msgid ""
+"%prog URL\n"
+"\n"
+"Where URL is for example http://google.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+msgid "Base directory into which URL is saved. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:463
+msgid ""
+"Maximum number of levels to recurse i.e. depth of links to follow. Default "
+"%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:466
+msgid ""
+"The maximum number of files to download. This only applies to files from <a "
+"href> tags. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+msgid "Show detailed output information. Useful for debugging"
+msgstr ""
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 42a90d8eb6..5fde2474fa 100644
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-03-17 10:34+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-25 21:28+0000\n"
 "Last-Translator: S. Dorscht <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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -23,13 +23,14 @@ msgid "Does absolutely nothing"
 msgstr "Macht gar nix"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -46,21 +47,23 @@ msgstr "Macht gar nix"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -68,21 +71,25 @@ msgstr "Macht gar nix"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -138,27 +145,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Metadaten aus %s Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Umschlagbild aus Comic Dateien extrahieren"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Metadaten aus Büchern in ZIP Archiven lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Metadaten von eBooks in RAR Archiven lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Geben Sie die Metadaten in %s Dateien an"
 
@@ -232,17 +240,17 @@ msgstr "Gewähltes Plugin ausschalten"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Im Reader ist keine Speicherkarte eingesteckt."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Nicht genügend freier Speicherplatz auf der Speicherkarte"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Nicht genügend freier Spreicherplatz im Hauptspeicher"
 
@@ -575,7 +583,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "Konnte kein eBook im Archiv finden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -593,14 +601,14 @@ msgstr ""
 "Verknüpfungen aus dem\n"
 "<spine> Element der OPF Datei verwendet.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Ausgabe geschrieben nach "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Geben Sie eine Eingabedatei im HTML Format an."
 
@@ -623,26 +631,26 @@ msgstr ""
 "\t\tZu viel Textauszeichnung. Wieder-Aufteilung ohne Bewahrung der Struktur. "
 "Dies kann zu falschem Rendering führen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Verarbeitetes HTML wurde geschrieben in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Einstellungen zur Kontrolle der Durchforstung von HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist das aktuelle Verzeichnis."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Zeichenkodierung für HTML Dateien. Die Voreinstellung ist automatisches "
 "Erkennen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -650,11 +658,11 @@ msgstr ""
 "Erstellt die Ausgabe in eine ZIP Datei. Wird diese Option angegeben, sollte -"
 "-output der Name einer Datei und nicht eines Verzeichnisses sein."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Kontrolliert die Verfolgung von Verknüpfungen in HTML Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -662,7 +670,7 @@ msgstr ""
 "Durchforstet Verknüpfungen in HTML Dateien zuerst in die Breite. "
 "Normalerweise werden sie zuerst in die Tiefe durchforstet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -671,39 +679,39 @@ msgstr ""
 "Dateien. Darf nicht negativ sein. 0 gibt an, dass keine Verknüpfungen in der "
 "ursprünglichen HTML Datei verfolgt werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Geben Sie die Metadaten des erstellten eBooks an"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Geben Sie den Titel an. Voreinstellung ist automatische Ermittlung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "Autor(en) des eBooks, als eine durch & getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Das Thema dieses Buches, als durch Kommata getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Geben Sie den Herausgeber dieses Buches an."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Inhaltsübersicht dieses Buches."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Metadaten aus der angegebenen OPF Datei laden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Hilfreiche Einstellungen zur Fehlersuche"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -711,13 +719,13 @@ msgstr ""
 "Noch ausführlicher bei der weiteren Verarbeitung vorgehen. Kann zur "
 "Vergrößerung der Ausführlichkeit mehrfach angegeben werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Ausgabe HTML ist \"hübsch gedruckt\" zur einfacheren Analyse durch "
 "menschliche Wesen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -747,7 +755,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist aktuelles Verzeichnis."
 
@@ -764,7 +772,7 @@ msgid "Useful for debugging."
 msgstr "Hilfreich bei der Fehlersuche."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB eBook erstellt in"
 
@@ -807,9 +815,9 @@ msgid "Sort key for the author"
 msgstr "Sortierung nach Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Herausgeber"
 
@@ -1727,63 +1735,63 @@ msgstr "Gebe Autoren ein"
 msgid "Set the comment"
 msgstr "Gebe Kommentar ein"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Produzent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Bemerkung"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Etiketten"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
@@ -1919,7 +1927,7 @@ msgstr "Geben Sie die Sprache an"
 msgid "Set the ISBN"
 msgstr "Geben Sie sie ISBN an"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Geben Sie das Feld dc:language an"
 
@@ -1935,11 +1943,11 @@ msgstr "Benutzung: rb-meta file.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "Erstelle Mobipocket Datei aus EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] dateiname.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "Original MOBI HTML gespeichert in"
 
@@ -2123,93 +2131,93 @@ msgstr ""
 "\tBeschneidet ein pdf. \n"
 "\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Häufig benutzte Verzeichnisse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 "Das zu verwendende Format bei der Speicherung einzelner Dateie auf die "
 "Festplatte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Bestätigung vor dem Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Schaltflächengröße der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Zeige Schaltflächenbeschriftung in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Aufteilung des Hauptfensters"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Benutze römische Ziffern für Seriennummerierung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Liste der Etiketten nach Beliebtheit sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Voreinstellungen für Konvertierung zu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Optionen für den LRF eBook Viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 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:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "Älteste in der Datenbank gespeicherte Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Symbol im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Geladene Nachrichten auf das Gerät übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 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:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -2217,11 +2225,17 @@ msgstr ""
 "Zeige Cover-Ansicht in einem eigenen Fenster anstatt im Hauptfenster von "
 "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+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/add.py:87
 msgid "Added %s to library"
 msgstr "%s zur Bibliothek hinzugefügt"
@@ -2260,7 +2274,7 @@ msgid "Adding books to database..."
 msgstr "Füge Bücher zur Datenbank hinzu..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "Lese Metadaten..."
 
@@ -2268,43 +2282,189 @@ msgstr "Lese Metadaten..."
 msgid "Searching in"
 msgstr "Suche in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Gerät ist nicht mehr verbunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Geräteinformationen erstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Liste der Bücher auf dem Gerät erstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Metadaten zum Gerät senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "%d Bücher auf das Gerät laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Bücher vom Gerät löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Bücher vom Gerät herunterladen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Buch auf dem Gerät ansehen"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "und aus der Datenbank löschen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr "Geben Sie die voreingestellte Übertragungsart an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr "eMail an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "An Hauptspeicher senden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "An Speicherkarte senden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr "Gewähltes Format an Hauptspeicher übertragen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr "Gewähltes Format an Speicherkarte übertragen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr "Keine Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr "ausgewählt zum Versenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+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:412
+msgid "No device"
+msgstr "Kein Gerät"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr "Übertragung schlug fehl: Kein Gerät verbunden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr "Keine Speicherkarte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+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:449
+msgid "E-book:"
+msgstr "eBook:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr "Im Anhang finden Sie das eBook"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "von"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr "im %s Format."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr "Sende eMail an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Keine geeigneten Formate"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+"Konnte die folgenden Bücher nicht versenden, da keine passenden Formate "
+"vorhanden:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr "Senden der Bücher schlug fehl"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr "Senden der folgenden Bücher schlug fehl:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr "Per eMail versendet:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr "Nachrichten:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr "Im Anhang ist"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr "Nachrichten senden an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Sende Nachrichten an das Gerät."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Sende Bücher an das Gerät."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Die folgenden Bücher konnten nicht auf das Gerät geladen werden, da keine "
+"geeigneten Formate vorhanden sind:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Gerätespeicher voll"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Es können keine Bücher mehr auf das Gerät geladen werden, da der "
+"Gerätespeicher voll ist "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pfad"
@@ -2313,7 +2473,8 @@ msgstr "Pfad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2412,27 +2573,31 @@ msgstr "&Weite"
 msgid "Disable &Trimming"
 msgstr "Beschneiden ausschal&ten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "von"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
+"eMail\n"
+"Versand"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Allgemein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
-msgstr "Schnittstelle"
+msgstr "Bedienungsoberfläche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2440,105 +2605,158 @@ msgstr ""
 "Content\n"
 "Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr "Automatisches Versenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr "eMail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+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/dialogs/config.py:150
+msgid ""
+"If checked, downloaded news will be automatically mailed <br>to this email "
+"address (provided it is in one of the listed formats)."
+msgstr ""
+"Wenn ausgefüllt, werden geladene Nachrichten automatisch <br>an diese eMail "
+"Adresse versendet (vorausgesetzt sie entspricht einem der angegebenen "
+"Formate)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:224
+msgid "new email address"
+msgstr "Neue eMail Adresse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr "Googlemail Setup abschließen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+"Vergessen Sie nicht, Ihren Googlemail Benutzernamen und Ihr Passwort "
+"anzugeben"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr "Schlechte Einstellung"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr "Sie müssen die Absender eMail Adresse angeben"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+"Sie müssen den Benutzernamen und das Passwort für den Mailserver angeben."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Kein gültiger Plugin Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s ist kein gültiger Plugin Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Plugin wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "Plugin kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "Das Plugin: %s kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Plugin nicht anpassbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "Plugin: %s bedarf keines Anpassens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Anpassen von %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "Kann festinstalliertes Plugin nicht entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " kann nicht entfernt werden, da es ein festinstalliertes Plugin ist. "
 "Versuchen Sie, es auszuschalten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Fehler Log:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Zugriffs-Protokolldatei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Content Server konnte nicht gestartet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr "Ort der Datenbank wählen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Ungültige Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 "Die Größe %s ist ungültig. Sie muss der Form BreitexHöhe entsprechen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Ortsangabe der Datenbank ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Muss ein Verzeichnis sein."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Ortsangabe der Datenbank ungültig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Muss ein Verzeichnis sein."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ortsangabe der Datenbank ungültig.<br>Speichern nicht möglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Komprimiere Datenbank. Das kann etwas dauern..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Komprimiere Datenbank..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Komprimiere Datenbank. Das kann etwas dauern..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2547,16 +2765,16 @@ msgstr ""
 "sortiert gespeichert und die Metadaten werden in der Datei metadata.db "
 "gespeichert)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Zu einem neuen Ort der Datenbank wechseln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2574,18 +2792,18 @@ msgstr "Zu einem neuen Ort der Datenbank wechseln"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Benachrichtigung anzeigen, wenn &neue Version verfügbar ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
@@ -2593,19 +2811,19 @@ msgstr ""
 "Falls Sie diese Einstellung ausschalten, werden die Metadaten aus dem "
 "Dateinamen erschlossen. Dies kann unter Erweitert konfiguriert werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "&Metadaten aus Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Format zur &Speicherung einer Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "Voreinstellung für Zei&tüberschreitung bei Netzwerkverbindungen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2613,117 +2831,241 @@ msgstr ""
 "Voreinstellung der Zeitüberschreitung für Netzwerkabrufe festsetzen (Gilt "
 "immer dann, wenn aus dem Internet Informationen abgerufen werden sollen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " Sekunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wäh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Hoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Niedrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "Auftrags&priorität:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis zur Liste der häufig genutzten Verzeichnisse hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis von der Liste der häufig genutzten Verzeichnisse entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "&Römische Ziffern für Serien Nummerierung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Symbol im Sys&tembereich der Kontrollleiste aktivieren (erfordert Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr "Be&nachrichtigungen im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Zeige Cover-Ansicht in einem eigenen Fenster (Benötigt einen Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Geladene &Nachrichten automatisch an das Gerät senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "Nachrichten nach dem Senden an das Gerät aus der Bibliothek &löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "A&nzahl der anzuzeigenden Umschlagbilder in der Cover-Ansicht (Neustart "
 "erforderlich):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Groß"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Größe der Schaltflächen in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Zeige &Text in Schaltflächen der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Si&chtbare Spalten in Bibliothek-Ansicht wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Internen &Viewer verwenden für:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+"calibre kann Ihre Bücher an Sie (oder Ihr Lesegerät) per eMail versenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr "eMail senden &von:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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>Dies steht im \"Von\" Feld (Absender) von mit calibre versendeten "
+"eMails.<br> Geben Sie Ihre eMail Adresse an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr "Eine eMail Adresse hinzufügen, an die die Bücher gesendet werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr "eM&ail hinzufügen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr "Als Voreinstellung verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr "eMail entfe&rnen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+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>Ein Mailserver ist nützlich, wenn der Diensteanbieter, an den Sie die "
+"eMail senden, nur eMails von bekannten eMail-Diensteanbietern annimmt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr "Mail&server"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+"calibre kann <b>wahlweise</b> einen Server zum Versenden von Nachrichten "
+"verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr "&Hostname:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr "Der Hostname Ihres Mailservers. Z.B. smtp.gmail.com"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr "&Port:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+"Der Anschluss (Port) auf dem Ihr Mailserver auf Verbindungen wartet. "
+"Voreinstellung ist 25"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "Ben&utzername:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr "Ihr Benutzername auf dem Mailserver"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Passwort:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr "Ihr Passwort auf dem Mailserver"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr "&Zeige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr "V&erschlüsselung:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+"TLS Verschlüsselung für die Verbindung zum Mailserver verwenden. Dies trifft "
+"meistens zu."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr "&TLS"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr "SSL Verschlüsselung für die Verbindung zum Mailserver verwenden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr "&SSL"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr "Googlemail verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Freier unbenutzter Festplattenspeicher der Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "Datenbank &komprimieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadaten aus dem Dateinamen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2733,23 +3075,11 @@ msgstr ""
 "von überall aus mit Hilfe eines Browsers auf Ihre Büchersammlung zugreifen "
 "können. Einstellungsänderungen erfolgen erst nach einem Neustart des Servers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "Server &Port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "Ben&utzername:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Passwort:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2757,13 +3087,13 @@ msgstr ""
 "Wenn Sie das Kennwort leer lassen, kann jeder auf Ihre Büchersammlung über "
 "das Webinterface zugreifen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "Pa&sswort anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2771,31 +3101,31 @@ msgstr ""
 "Maximale Größe (BreitexHöhe) der angezeigten Umschlagbilder. Größere "
 "Umschlagbilder werden verkleinert. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Maximale Ums&chlagbild-Größe:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "Server &starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "Server st&oppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "Server &testen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "Server &automatisch beim Starten hochfahren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Server Logs ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2809,7 +3139,7 @@ msgstr ""
 "auf Ihrem iPhone hinzufügen. In diesem Fall sollte meinservername der volle "
 "Hostname oder die IP Adresse dieses Rechners sein."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -2817,27 +3147,27 @@ msgstr ""
 "Hier können Sie das Verhalten von Calibrie anpassen, indem sie festlegen, "
 "welche Plugins verwendet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr "Plugin &ein-/ausschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "Plugin &anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "Plugin entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "Neues Plugin hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Plugin Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Hinzufügen"
 
@@ -2865,7 +3195,7 @@ msgstr "Konvertiere %s in "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadaten"
@@ -2925,26 +3255,26 @@ msgstr "Wählen Sie das Umschlagbild für "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Lesen nicht möglich"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Sie haben nicht die nötigen Rechte, um diese Datei zu lesen: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Es trat ein Fehler beim Lesen dieser Datei auf: <br /><b>"
 
@@ -2954,7 +3284,7 @@ msgid " is not a valid picture"
 msgstr " ist kein gültiges Bild"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
@@ -3298,55 +3628,62 @@ msgstr "&Titel des erstellten Inhaltsverzeichnisses"
 msgid "Level &3 TOC"
 msgstr "Ebene &3 Inhaltsverzeichnis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Sortierung nach Autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Verbindung nicht möglich"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr "Finde Metadaten..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr "Konnte Metadaten nicht finden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
-"Sie müssen einen gültigen Zugangsschlüssel (access key) für isbndb.com "
-"angeben"
+"Der Download der Metadaten scheint zum Stillstand gekommen zu sein. "
+"Versuchen Sie es später erneut."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Fehler beim Abrufen der Metadaten"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr "Warnung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr "Konnte Metadaten nicht abrufen von:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Keine Metadaten gefunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Keine Metadaten gefunden, versuchen Sie, den Titel und den Autor oder die "
 "ISBN anzupassen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Metadaten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Metadaten abrufen für <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Kostenloses Konto anmelden bei <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> um einen Zugriffsschlüssel zu "
-"erhalten."
+"<p>calibre kann Metadaten für Bücher von zwei Orten abrufen: <b>Google "
+"Books</b> und <b>isbndb.com</b>. <p>Wenn Sie isbndb.com verwenden möchten, "
+"müssen Sie einen <a href=\"http://www.isbndb.com\">kostenfreien Account</a> "
+"anlegen und den Zugangsschlüssel unten angeben."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3691,33 +4028,33 @@ msgstr "&Format entfernen:"
 msgid "A&utomatically set author sort"
 msgstr "Automatisch Sortierung nach Autor setzen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr "Kein Format gewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr "Konnte Metadaten nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr "Konnte Metadaten des Formats %s nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr "Konnte Umschlagbild nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr "Konnte Umschlagbild des Formats %s nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr "Das Umschlagbild im Format %s ist ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3727,26 +4064,44 @@ msgstr ""
 "<b>LibraryThing.com</b> an. <br/>Insofern Sie dies nicht besitzen, können "
 "Sie sich kostenlos <a href='http://www.librarything.com'>anmelden</a>! </p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
-msgstr "Falsches Umschlagbild"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr "Lade Umschlagbild..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr "Das Umschlagbild ist kein gültiges Bild"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Kann kein Umschlagbild abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Sie müssen die ISBN für dieses Buch angeben."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Konnte kein Umschlagbild abrufen.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Sie müssen die ISBN für dieses Buch angeben."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr "Der Download timed out."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr "Falsches Umschlagbild"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr "Das Umschlagbild ist kein gültiges Bild"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr "Konnte Metadaten nicht abrufen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr "Sie müssen wenigstens ISBN, Titel, Autor oder Herausgeber angeben"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3828,84 +4183,85 @@ msgstr "Angepasst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr "Geplant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d Downloadschemata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr "Montag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr "Tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr "Freitag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr "Samstag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr "Account-Informationen müssen angegeben werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr "Dieses Schema erfordert einen Benutzernamen und ein Kennwort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Erstellt von: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr "Vor %d Tagen, %d Stunden und %d Minuten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr "Zuletzt geladen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Zuletzt geladen: niemals"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Zeitgesteuerter Nachrichten Download"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Neue individuelle Nachrichtenquelle hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4357,11 +4713,11 @@ msgstr "Regulärer Ausdruck (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Kein Treffer"
 
@@ -4446,35 +4802,35 @@ msgstr "Kann Aufträge, die mit dem Gerät kommunizieren, nicht abbrechen"
 msgid "Job has already run"
 msgstr "Auftrag wird schon ausgeführt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Größe (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Bewertung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Keine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Buch <font face=\"serif\">%s</font> von %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "Das ist nicht gestattet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -4482,11 +4838,15 @@ msgstr ""
 "Direktes Hinzufügen auf das Gerät wird nicht unterstützt. Fügen Sie das Buch "
 "zuerst zur Bibliothek hinzu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Suche (Zur erweiterten Suche die Schaltfläche links klicken)"
 
@@ -4515,7 +4875,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Keine Treffer</b> für die Suchworte <i>%s</i> gefunden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -4562,23 +4922,23 @@ msgstr "eBook öffnen"
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Fehler bei der Kommunikation mit dem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr "Spen&den Sie, um calibre zu unterstützen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Neustart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4586,42 +4946,23 @@ msgstr ""
 "<p>Hilfe gibt es online bei <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s von <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "An Hauptspeicher senden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "An Speicherkarte senden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "und aus der Datenbank löschen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Auf die Speicherkarte senden (Voreinstellung)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Metadaten einzeln bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Metadaten auf einmal bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Bücher aus einem einzelnen Verzeichnis hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -4630,7 +4971,7 @@ msgstr ""
 "Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
 "verschiedenen Formaten)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -4638,79 +4979,79 @@ msgstr ""
 "Bücher aus Verzeichnissen hinzufügen, inklusive Unterverzeichnissen "
 "(verschiedene Bücher im Verzeichnis, jede eBook Datei ist ein anderes Buch)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Nur das %s Format auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Vorschau"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Spezielles Format ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Einzeln konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Voreinstellung für Konvertierung eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Voreinstellungen für die Konvertierung von Comics eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Ähnliche Bücher..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Schlechter Datenbank Standort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Wählen Sie einen Speicherort für Ihre eBook Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr "Umschlagbilder durchsuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Gerät: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Angeschlossen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Gerätedatenbank ist beschädigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4741,67 +5082,56 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Lade Bücher auf das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "EPUB Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "LRF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "HTML Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "LIT Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "MOBI Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Text Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "PDF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Archive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr "Füge Bücher hinzu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Gerätespeicher voll"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>Es können keine Bücher mehr auf das Gerät geladen werden, da der "
-"Gerätespeicher voll ist "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -4809,63 +5139,39 @@ msgstr ""
 "Die gewählten Bücher werden <b>dauerhaft gelöscht</b> und die Dateien vom "
 "Computer entfernt. Sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Lösche Bücher vom Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Keine Bücher ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Sende Nachrichten an das Gerät."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr "Format wählen, das ans Gerät geschickt wird"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Sende Bücher an das Gerät."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Keine geeigneten Formate"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"Die folgenden Bücher konnten nicht auf das Gerät geladen werden, da keine "
-"geeigneten Formate vorhanden sind:<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Speichern auf Festplatte nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr "Speichere auf Festplatte..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Zielverzeichnis auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4873,64 +5179,64 @@ msgstr ""
 "<p>Die folgenden Bücher konnten nicht auf die Festplatte gespeichert werden, "
 "da das %s Format für sie nicht verfügbar ist:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Konnte einige eBooks nicht speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr " abgerufen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Kein Buch ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Ansehen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Format zur Vorschau wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "Konnte Verzeichnis nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s hat keine verfügbaren Formate."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Konfiguration nicht möglich während Aufträge abgearbeitet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Kopiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopiere Bibliothek nach "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Ungültige Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4938,24 +5244,24 @@ msgstr ""
 "<p>Es existiert bereits eine ungültige Datenbank in %s, bitte löschen Sie "
 "diese, bevor sie die bestehende Datenbank verschieben.<br>Fehler: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Konnte Datenbank nicht verschieben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Es sind keine genaueren Informationen verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Es sind keine weitere Informationen über Bücher auf dem Gerät verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4963,13 +5269,13 @@ msgstr ""
 "Es trat ein Fehler in der Kommunikation mit dem Gerät auf. Bitte entfernen "
 "und schließen Sie das Gerät wieder an und - oder starten Sie neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4978,15 +5284,15 @@ msgstr ""
 "href=\"%s\">DRM</a> geschützt. Sie müssen zunächst das DRM mit einem anderen "
 "Programm entfernen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr "Ungültiger Ort der Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr "Konnte nicht auf %s zugreifen. Verwende %s als Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4995,12 +5301,12 @@ msgstr ""
 "Falls Sie es nützlich finden, sollten Sie eine Spende zur Unterstützung "
 "seiner Entwicklung in Betracht ziehen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Es bestehen aktive Aufträge. Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
@@ -5010,11 +5316,11 @@ msgstr ""
 "                      'Das Beenden könnte das Gerät beschädigen.<br>\n"
 "                      'Wirklich beenden?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive Aufträge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5022,7 +5328,7 @@ msgstr ""
 "wird im System Tray weiter laufen. Zum Schließen wählen Sie <b>Beenden</b> "
 "im Kontextmenü des System Tray."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5030,7 +5336,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Neue Version verfügbar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5040,31 +5350,27 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">neuen Features</a> an. "
 "Möchten Sie die Download Seite besuchen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Neue Version verfügbar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr "Die im angegebenen Pfad sich befindende Bibliothek verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr "Minimiert im Systembereich der Kontrollleiste starten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr "Informationen zur Fehlersuche in Konsole aufzeichnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "Ausgabe:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
@@ -5072,19 +5378,19 @@ msgstr ""
 "Geben Sie das Ausgabeformat an, das zur Konvertierung von eBooks und "
 "geladener Nachrichten verwendet wird"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Suche:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -5092,7 +5398,7 @@ msgstr ""
 "Liste der Bücher nach Titel oder Autor durchsuchen<br><br>Durch Leerzeichen "
 "getrennte Wörter werden mit \"UND\" verknüpft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -5101,113 +5407,109 @@ msgstr ""
 "durchsuchen<br><br>Durch Leerzeichen getrennte Wörter werden mit \"UND\" "
 "verknüpft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Quick Search löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Übereinstimmung mit irgendeinem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Übereinstimmung mit allen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Nach Beliebtheit sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Bücher hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Bücher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Meta-Informationen editieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "An Reader übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "In eBooks umwandeln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr "Öffne Speicherort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr "Zeige Buchdetails"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Bücher desselben Autors"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Bücher dieser Serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr "Bücher dieses Herausgebers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Bücher mit denselben Etiketten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr "Spezielles Format an das Gerät senden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Voreinstellungen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr "Calibre konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -5402,88 +5704,88 @@ msgstr "Nichtproportionale Schriftgröße in Punkt"
 msgid "The standard font type"
 msgstr "Standardschriftart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Gehe zu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Stelle im Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 "Zu einem Verweis gehen. Um die Verweisnummern zu erhalten, Verweismodus "
 "verwenden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Suche nach Text im Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "eBook wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Titel für Lesezeichen eingeben:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr "Keine Treffer gefunden für: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "Lade Ablauf..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr "Lege %s an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "Lade eBook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Dieses Buch ist geschützt durch <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "DRM Fehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "Konnte eBook nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr "Einstellungen zur Kontrolle des eBook Viewers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5537,15 +5839,15 @@ msgstr "Lesezeichen"
 msgid "Toggle full screen"
 msgstr "Vollbildmodus beenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Ungültiger regulärer Ausdruck"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Ungültiger regulärer Ausdruck: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5555,7 +5857,7 @@ msgstr ""
 "%d\n"
 "Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
@@ -5565,7 +5867,7 @@ msgstr ""
 "%s\n"
 "verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
@@ -5575,15 +5877,15 @@ msgstr ""
 "%s\n"
 "verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Liste der auf dem Computer vorhandenen Bücher anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr "Liste der im Hauptspeicher des Geräts vorhandenen Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr "Liste der auf der Speicherkarte des Geräts vorhandenen Bücher"
 
@@ -6039,6 +6341,10 @@ msgstr "Konnte SSH Sitzung nicht abschließen: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Authentifizierung schlug fehl am Server: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr "eMail Versand kontrollieren"
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -6333,34 +6639,41 @@ msgstr "Laden der Artikel schlug fehl: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Rufe Feed ab"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "Spanisch"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Kroatisch"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Serbisch"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6408,7 +6721,7 @@ msgstr "Spanisch"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6460,27 +6773,35 @@ msgstr "Spanisch"
 msgid "English"
 msgstr "Englisch"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "Serbisch"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Spanisch"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "Französisch"
 
@@ -6489,6 +6810,10 @@ msgstr "Französisch"
 msgid "Dutch"
 msgstr "Niederländisch"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr "Bosnisch"
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6499,7 +6824,7 @@ msgstr "Portugisisch"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6510,10 +6835,6 @@ msgstr "Deutsch"
 msgid "Kovid Goyal"
 msgstr "Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "Kroatisch"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "Italienisch"
@@ -6611,6 +6932,25 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "&Priorität der Konvertierungsaufträge:"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Verbindung nicht möglich"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr ""
+#~ "Sie müssen einen gültigen Zugangsschlüssel (access key) für isbndb.com "
+#~ "angeben"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Metadaten abrufen für <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Kostenloses Konto anmelden bei <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> um einen Zugriffsschlüssel zu "
+#~ "erhalten."
+
 #~ msgid "&Access Key;"
 #~ msgstr "&Zugriffsschlüssel:"
 
@@ -6695,9 +7035,6 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "Cannot kill waiting jobs."
 #~ msgstr "Kann Aufträge in Warteliste nicht abbrechen."
 
-#~ msgid "Double click to <b>edit</b> me<br><br>"
-#~ msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
-
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Änderungen treten erst nach einem Neustart in Kraft."
 
@@ -6868,6 +7205,9 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Elemente mit dem Attribut class=\"chapter\" anzugleich, müsste man \"h\\"
 #~ "d,class,chapter\" benutzen. Voreinstellung ist %default"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Fehler beim Abrufen der Metadaten"
+
 #~ msgid ""
 #~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 #~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -6944,6 +7284,9 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Daten (in \n"
 #~ "einer OPF Datei). Sie erhalten ID Nummern mit dem Befehl \"list\". \n"
 
+#~ msgid "Send to storage card by default"
+#~ msgstr "Auf die Speicherkarte senden (Voreinstellung)"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "A&nzahl der Umschlagbilder, die (nach einem Neustart) in der Cover-Ansicht "
@@ -7269,3 +7612,6 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 #~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
 #~ "family:'DejaVu Sans';\"></p></body></html>"
+
+#~ msgid "Send specific format to device"
+#~ msgstr "Spezielles Format an das Gerät senden"
diff --git a/src/calibre/translations/el.po b/src/calibre/translations/el.po
index 8d2e81a489..e439a1c9ca 100644
--- a/src/calibre/translations/el.po
+++ b/src/calibre/translations/el.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2008-06-24 07:23+0000\n"
 "Last-Translator: Thanos Petkakis <thanospet@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -134,27 +141,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -218,17 +226,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -481,14 +489,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -507,88 +515,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -609,7 +617,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -624,7 +632,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -665,9 +673,9 @@ msgid "Sort key for the author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Εκδότης"
 
@@ -1393,63 +1401,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1565,7 +1573,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1581,11 +1589,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1752,97 +1760,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1879,7 +1891,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1887,43 +1899,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -1932,7 +2084,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2030,143 +2183,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2184,211 +2386,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2397,33 +2700,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2451,7 +2754,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2505,26 +2808,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2534,7 +2837,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2855,47 +3158,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3214,58 +3523,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3345,84 +3672,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3820,11 +4148,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3909,45 +4237,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3976,7 +4308,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4023,148 +4355,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4180,436 +4493,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4795,84 +5073,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4923,44 +5201,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5319,6 +5597,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5556,34 +5838,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5631,7 +5920,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5683,20 +5972,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5704,6 +6000,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5712,6 +6009,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5722,7 +6023,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5733,10 +6034,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index 3af9589279..3324ee932d 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: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-03-11 21:46+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-26 22:04+0000\n"
 "Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -25,13 +25,14 @@ msgid "Does absolutely nothing"
 msgstr "No hace nada en absoluto"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -48,21 +49,23 @@ msgstr "No hace nada en absoluto"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -70,21 +73,25 @@ msgstr "No hace nada en absoluto"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -140,27 +147,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Leer metadatos desde archivos %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Extraer portada de los archivos del cómic"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Leer metadatos de los libros electrónicos en los archivos ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Leer metadatos de los libros electrónicos en archivos RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Asignar metadatos a los archivos %s"
 
@@ -234,17 +242,17 @@ msgstr "Desactivar el complemento nombrado"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "El lector no tiene ninguna tarjeta de almacenamiento conectada"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Hay espacio insuficiente en la tarjeta de almacenamiento"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "No hay suficiente espacio libre en la memoria principal"
 
@@ -568,7 +576,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "No se pudo encontrar un libro-e dentro del archivo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -586,14 +594,14 @@ msgstr ""
 "enlaces se tomará del elemento\n"
 "<spine> en el archivo OPF  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Salida escrita en "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Debe especificar un archivo HTML de entrada."
 
@@ -616,25 +624,25 @@ msgstr ""
 "\t\tDemasiadas marcas. Volviendo a dividir sin preservar la estructura. Esto "
 "puede ocasionar un renderizado incorrecto."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Escribir el HTML procesado en "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Opciones para controlar HTML traversal"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "El directorio de Salida. Por defecto es el directorio actual."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Codificación de carácter para archivos HTML. Por defecto a auto detectar."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -642,11 +650,11 @@ msgstr ""
 "Crear la salida en un archivo zip. Si esta opción es especificada, el --"
 "output debería ser el nombre del archivo y no del directorio."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Control del seguimiento de enlaces en archivos HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -654,7 +662,7 @@ msgstr ""
 "Recorre los enlaces de los ficheros HTML primero en anchura. Normalmente se "
 "recorren primero en profundidad."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -663,40 +671,40 @@ msgstr ""
 "Debe ser un numero no-negativo. 0 implica que no se seguirá ningún enlace en "
 "el archivo HTML raiz."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Asignar metadatos del libro-e generado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Establecer el titulo. Por defecto es autodetectado."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "El/los autor(es) del libro-e como una lista separada por &."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 "El/los tema(s) de este libro, escritos como una lista separada por comas."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Asignar la editorial de este libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Un resumen de este libro"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Cargar metadatos del archivo OPF especificado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Utiles opciones para depurar."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -704,13 +712,13 @@ msgstr ""
 "Ser más explícito durante el procesamiento. Se puede especificar varias "
 "veces para incrementar el nivel de detalle."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "El HTML de salida está bien escrito para que sea más fácil de entender por "
 "humanos."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -740,7 +748,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Directorio de salida. Por defecto es el directorio actual"
 
@@ -757,7 +765,7 @@ msgid "Useful for debugging."
 msgstr "Útil para depuración."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "Libro-e OEB creado en"
 
@@ -800,9 +808,9 @@ msgid "Sort key for the author"
 msgstr "Clave de orden para el autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Editorial"
 
@@ -1706,63 +1714,63 @@ msgstr "Introduzca los autores"
 msgid "Set the comment"
 msgstr "Vea el comentario"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Producido por"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Comentarios"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Series"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
@@ -1896,7 +1904,7 @@ msgstr "Asignar idioma"
 msgid "Set the ISBN"
 msgstr "Asignar ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Asignar campo dc:language ()"
 
@@ -1912,11 +1920,11 @@ msgstr "Uso: rb-meta file.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "Creando archivo Mobipocket de un EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [opciones] milibroe.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "HTML MOBI en bruto guardado en"
 
@@ -2103,91 +2111,91 @@ msgstr ""
 "\tRecorta un pdf. \n"
 "\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Directorios usados con frecuencia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 "Por defecto, enviar archivo a tarjeta de almacenamiento en vez de a memoria "
 "principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr "El formato a usar al guardar archivos al disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Confirmar antes de borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Tamaño de iconos de barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Mostrar etiquetas de botones en la barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Ventana principal geometrica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr "Notificar cuando una versión esta disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Usar numeros Romanos para numero de series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Ordenar lista de etiquetas por popularidad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 "Numero de portadas de libros a mostrar en el modo de navegación de portadas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Opciones por defecto para conversión a LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Opciones para el visor de libros-e LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr "Lanzar servidor de contenidos automáticamente al iniciar aplicación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "Noticias antiguas guardadas en la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Mostrar el icono en la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Subir noticias descargadas al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr "Eliminar libros de la biblioteca después de subirlos al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -2195,10 +2203,16 @@ msgstr ""
 "Mostrar el flujo de cubiertas en una ventana separada en vez de en la "
 "ventana principal de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr "Desactivar notificaciones del icono de la bandeja de sistema"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+"Acción por defecto que se ejecutará cuando se pulse el botón de enviar a "
+"dispositivo"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr "Se ha añadido %s a la biblioteca"
@@ -2237,7 +2251,7 @@ msgid "Adding books to database..."
 msgstr "Añadiendo libros a base de datos..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "Leyendo metadatos..."
 
@@ -2245,43 +2259,188 @@ msgstr "Leyendo metadatos..."
 msgid "Searching in"
 msgstr "Buscando en"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Dispositivo no esta conectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Obtener información de dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Obtener lista de libros en dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Enviar metadata al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Cargar %d libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Borrar libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Descargar libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Ver libro en dispositvo"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "y borrar de la biblioteca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr "Asignar acción de enviar a dispositivo por defecto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr "Enviar como correo electrónico a"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Enviar a la memoria interna"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Enviar a la tarjeta de memoria"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr "Enviar formato especificado a memoria principal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr "Enviar formato especificado a tarjeta de memoria"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr "Sin libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr "elegido para enviar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr "Elige el formato para enviar al dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr "Sin dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr "No se pudo enviar: no hay un dispositivo conectado"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr "Sin tarjeta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr "No pudo enviar: el dispositivo no tiene tarjeta de memoria"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr "Libro-e:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr "Adjuntado, encontrarás el libro-e"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "por"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr "en el formato %s."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr "Enviando correo a"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "No hay formatos adecuados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+"No se pudo enviar por correo los siguientes libros porque no estaban en "
+"formatos apropiados: <br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr "Falló al enviar por correo el/los libro(s)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr "Falló al enviar por correo los siguientes libros:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr "Enviado por correo-e:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr "Noticias:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Enviando noticias al dispositivo."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Enviando libros al dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"No se pudieron enviar los siguientes libros al dispositivo, ya que no se "
+"hallaron formatos adecuados: <br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "No hay espacio en el dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>No se pueden guardar los libros porque no hay espacio en el dispositivo "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Ruta"
@@ -2290,7 +2449,8 @@ msgstr "Ruta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2388,27 +2548,29 @@ msgstr "&Ancho"
 msgid "Disable &Trimming"
 msgstr "Desactivar &recortado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " complementos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "por"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Avanzada"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "General"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Interfaz:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Avanzada"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2416,104 +2578,155 @@ msgstr ""
 "Contenido\n"
 "Servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Complementos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr "Autoenviar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr "Correo-e"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+"Formatear como correo-e. El primero formato que concuerde se enviará."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+msgid ""
+"If checked, downloaded news will be automatically mailed <br>to this email "
+"address (provided it is in one of the listed formats)."
+msgstr ""
+"Si está seleccionada, las noticias descargadas se enviarán automáticamente "
+"<br>a esta dirección de correo (dada en uno de los siguientes formatos)."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:224
+msgid "new email address"
+msgstr "nueva dirección de correo-e"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr "Terminar configuración de gmail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr "No olvide introducir su nombre de usuario de gmail y su contraseña"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr "Configuración defectuosa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr "Debe asignar la dirección de correo-e remitente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+"Debe especificar el nombre de usuario y contraseña del servidor de correo."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Ruta de complemento inválida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s no es una ruta de complemento válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Elegir complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "El complemento no puede desactivarse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "El complemento: %s no puede desactivarse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Complemento no personalizable"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "Complemento: %s no necesita personalización"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Personalizar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "No se puede eliminar el complemento incorporado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " no puede eliminarse. Es un complemento incorporado. En vez de eso, intenta "
 "desactivarlo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Registro de errores:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Registro de accesos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Falló al iniciar el servidor de contenidos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr "Seleccionar ubicación de base de datos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Tamaño no válido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "El tamaño %s no es válidao. Debe ser de la forma anchoxalto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Ubicación no válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Debe ser un directorio."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Ubicación no válida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Debe ser un directorio."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ubicación no válida.<br>Imposible escribir en "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Compactando base de datos. Esto podría durar un rato"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Compactando..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Compactando base de datos. Esto podría durar un rato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Configuración"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2521,16 +2734,16 @@ msgstr ""
 "Emplazamiento de los libros-e (Los libros-e son almacenados en carpetas "
 "ordenadas por autor, los metadatos se almacenan en el archivo metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Navegar a la nueva ubicación de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2548,18 +2761,18 @@ msgstr "Navegar a la nueva ubicación de la base de datos"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Mostrar aviso cuando una &nueva versión esté disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
@@ -2567,19 +2780,19 @@ msgstr ""
 "Si desactivas este característica, se extraerán los metadatos del nombre del "
 "archivo. Esto se puede configurar en la sección avanzada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Leer &metadatos de archivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Formato al guardar un &único archivo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "&timeout por defecto de la red:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2587,113 +2800,237 @@ msgstr ""
 "Establecer el tiempo de espera maximo para peticiones de red (cuando "
 "conectamos a internet para adquirir alguna información)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " segundos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Seleccionar idioma (requiere reiniciar el programa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Alta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Baja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "Tareas &prioridad:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Añadir directorio a la lista de directorios frecuentes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Eliminar directorio a la lista de directorios frecuentes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Uso de numerales &romanos para números de serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Activar icono en &bandeja del sistema (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr "Mostrar &noticaciones en bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Mostrar &navegador de portadas en ventana separada (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Enviar &noticias descargadas automáticamente al lector de libros-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "&Borrar noticias de biblioteca cuando se envía al lector"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Número de portadas a mostrar en modo navegador (requiere reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Pequeño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "Tamaño de &botón en la barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Mostrar &texto en los botones de la barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Seleccione las &columnas visibles en la vista de biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Usar &visor interno para:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr "calibre le puede enviar los libros (o a su lector) por correo-e"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr "Enviar correo-e &desde:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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>En el campo Desde se mostrará un lista con correos-e enviados por "
+"calibre.<br> Asígnelo a su dirección de correo."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr "Añadir una dirección de correo a la que se enviarán libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr "&Añadir correo-e"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr "Asignar por &defecto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr "&Eliminar correo-e"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+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>Un servidor de correo es útil si el servicio al que está enviando correo "
+"sólo acepta correos electrónicos de servicios de correo ampliamente "
+"conocidos."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr "Servidor de correo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+"calibre puede usar un servidor para enviar correo <b>opcionalmente</b>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr "&Nombre del equipo:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+"Nombre de equipo de su servidor de correo. Por ejemplo, smtp.gmail.com"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr "&Puerto:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+"Puerto en el que su servidor de correo escucha las conexiones. Por defecto "
+"es el 25"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "&Usuario:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr "Su nombre de usuario en el servidor de correo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Contraseña:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr "Su contraseña en el servidor de correo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr "&Mostrar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr "&Cifrado:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+"Usar cifrado TLS al conectarse con el servidor de correo. Usarlo es lo más "
+"común."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr "&TLS"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr "Usar cifrado SSL al conectar al servidor de correo."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr "&SSL"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr "Usar Gmail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Espacio de disco disponible de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Compactar base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadatos a partir del nombre de archivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2704,23 +3041,11 @@ msgstr ""
 "en las preferencias tendrá efecto sólo después de que se reinicie el "
 "servidor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "&Puerto del servidor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "&Usuario:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Contraseña:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2728,13 +3053,13 @@ msgstr ""
 "Si dejas la contraseña en blanco, cualquiera podrá acceder a tu colección de "
 "libros usando la interfaz web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Mostrar clave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2742,31 +3067,31 @@ msgstr ""
 "El tamaño máximo (anchoxalto) con el que se mostrarán las portadas. Las "
 "portadas grandes son redimensionadas. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Máximo tamaño de &portada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "&Iniciar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "P&arar sevidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Probar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "Ejecutar servidor &automáticamente al iniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Ver logs del &servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2780,7 +3105,7 @@ msgstr ""
 "Stanza de tu iphone. Aquí midirecciondeequipo debería ser un nombre de "
 "equipo completo válido o la dirección IP de ese computador."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -2788,27 +3113,27 @@ msgstr ""
 "Aquí puedes personalizar el comportamiento de Calibre controlando que "
 "complementos usa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr "Activar/&Desactivar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "&Personalizar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "&Eliminar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "Añadir nuevo complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Archivo de complemento:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Añadir"
 
@@ -2836,7 +3161,7 @@ msgstr "Convertir %s a "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadatos"
@@ -2896,26 +3221,26 @@ msgstr "Elegir portada para "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "No se puede leer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "No tienes permiso de lectura en el archivo: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Error leyendo archivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Hubo un error leyendo el archivo: <br /><b>"
 
@@ -2925,7 +3250,7 @@ msgid " is not a valid picture"
 msgstr " no es una imagen válida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "No se puede convertir"
 
@@ -3263,52 +3588,60 @@ msgstr "&Título para la tabla de contenidos generada"
 msgid "Level &3 TOC"
 msgstr "Nivel &3 de la TDC"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Ordenación por autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "No se puede conectar"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr "Buscando metadatos..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Especifica una clave de acceso válida para isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr "No se han podido encontrar metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Error de obtención de metadatos"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+"La descarga de metadatos parece haberse interrumpido. Inténtelo otra vez."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr "Aviso"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr "No se pudieron obtener los metadatos de:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "No encontró metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "No encontró metadatos, intente ajustar el título y el autor o la clave ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Buscar metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Buscando metadatos para <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Registraros gratuitamente en <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> para obtenir una clave de "
-"acceso."
+"<p>calibre puede encontrar metadatos de sus libros en dos lugares: <b>Google "
+"Books</b> y <b>isbndb.com</b>. <p>Para usar isbndb.com debe creares una <a "
+"href=\"http://www.isbndb.com\">cuenta gratuita</a> e introducir su "
+"contraseña de acceso debajo."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3647,33 +3980,33 @@ msgstr "Eliminar &formato:"
 msgid "A&utomatically set author sort"
 msgstr "Seleccionar a&utomáticamente el orden de autores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr "No se ha seleccionado el formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr "No se pudieron leer los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr "No se puede leer metadatos del formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr "No se puede leer la portada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr "No se puede leer la portada del formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr "La portada en el formato %s no es válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3683,26 +4016,44 @@ msgstr ""
 "<b>LibraryThing.com</b>. <br/>Si no dispone de una cuenta, puede <a "
 "href='http://www.librarything.com'>regisrarse</a> de manera gratuita.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
-msgstr "Portada mala"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr "Descargando portada..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr "La portada no es una imagen válida"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "No se puede descargar la portada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Especifique primero un ISBN válido para el libro."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>No se puede descargar la portada.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Especifique primero un ISBN válido para el libro."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr "El tiempo de descarga ha vencido."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr "Portada mala"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr "La portada no es una imagen válida"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr "No se pudieron obtener los metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr "Debe especificar al menos uno del ISBM, título, autores o editorial"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3731,7 +4082,7 @@ msgstr "IS&BN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
 msgid "&Fetch metadata from server"
-msgstr ""
+msgstr "&Obtener metadatos del servidor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
 msgid "Available Formats"
@@ -3756,7 +4107,7 @@ msgstr "Reiniciar portada a la de por defecto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid "Fetch &cover image from server"
-msgstr ""
+msgstr "Obtener imagen de &portada del servidor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
 msgid ""
@@ -3765,7 +4116,7 @@ msgstr "Cambiar nombre de usuario y/o clave de tu cuenta de LibraryThing.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 msgid "Change &password"
-msgstr ""
+msgstr "Cambiar &contraseña"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
 msgid "Password needed"
@@ -3786,84 +4137,85 @@ msgstr "Personalizado"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr "Planificado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Buscar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d recetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr "lunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr "martes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr "día"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr "viernes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr "sábado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr "domingo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr "jueves"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr "Hay que rellenar la información de cuenta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr "Esta receta requiere un usuario y contraseña"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Creado por: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr "Hace %d días, %d horas y %d minutos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr "Último descargado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Última descarga: nunca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Descarga de noticias planificada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Añadir nueva fuente de noticias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4312,11 +4664,11 @@ msgstr "Expresión regular (?P&lt;titulo&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Ninguna coincidencia"
 
@@ -4401,35 +4753,35 @@ msgstr "No se pueden matar tareas que se comunican con el dispositivo"
 msgid "Job has already run"
 msgstr "La tarea ya se ha ejecutado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Tamaño (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Fecha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Valoración"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Ninguno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Libro <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "No permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -4437,11 +4789,15 @@ msgstr ""
 "Soltarlo en el dispositivo no está soportado. Primero añade el libro a la "
 "biblioteca de calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Doble click para <b>editarme</b><br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 "Búsqueda (Para Busqueda Avanzada, haga click en el boton de la izquierda)"
@@ -4471,7 +4827,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>No </b>se han encontrado coincidencias para \"<i>%s</i>\"."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "No se han encontrado coincidencias"
 
@@ -4518,23 +4874,23 @@ msgstr "Abrir libro-e"
 msgid "Configure"
 msgstr "Configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Error en la comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Restaurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr "&Donar para apoyar calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4542,42 +4898,23 @@ msgstr ""
 "<p>Para mas ayuda, visite <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Enviar a la memoria interna"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Enviar a la tarjeta de memoria"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "y borrar de la biblioteca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "enviar a la tarjeta de almacenamiento por defecto"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Editar metadatos individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Edita metadatos en bloque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "añadir libros desde un único directorio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -4586,7 +4923,7 @@ msgstr ""
 "directorio, se asume que cada archivo de libro-e es el mismo libro en "
 "diferente formato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -4594,79 +4931,79 @@ msgstr ""
 "Añadir libros de directorios, incluyendo subdirectorios (Múltiples libros "
 "por directorio, se asume que cada archivo de libro-e es un libro diferente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Guardar en el disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Guardar en el disco, en un único directorio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Guardar solamente el formato %s en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Ver formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Convertir individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Convertir en bloque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Asigna características por defecto en la conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Asigna características por defecto en la conversión de comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Libros similares..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Lugar de base de datos incorrecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Elige otro lugar para tu biblioteca de libros-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr "Navegar por portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Conectado "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Base de datos del dispositivo corrupta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4696,66 +5033,56 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Enviando libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "Libros en EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "Libros en LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "Libros en HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "Libros en LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "Libros en MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Libros en Text"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "Libros en PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Archivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr "Añadiendo libros..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "No hay espacio en el dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>No se pueden guardar los libros porque no hay espacio en el dispositivo "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -4763,63 +5090,39 @@ msgstr ""
 "Los libros seleccionados serán <b>eliminados permanentemente</b> y los "
 "archivos borrados de tu equipo. ¿Estás seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Eliminando libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "No se pueden editar los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "No hay libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Enviando noticias al dispositivo."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr "Elige el formato para enviar al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Enviando libros al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "No hay formatos adecuados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"No se pudieron enviar los siguientes libros al dispositivo, ya que no se "
-"hallaron formatos adecuados: <br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "No se puede guardar en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr "Guardando al disco..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr "Guardado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Elegir directorio de destino"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4827,64 +5130,64 @@ msgstr ""
 "<p>No se pudieron guardar los siguientes libros en disco, porque el formato "
 "%s no está disponible para ellos:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "No se pudieron guardar algunos libros-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Buscando noticias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr " obtenido."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Seleccione un libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "No se puede visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Elija el formato para visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "No se puede abrir carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s no tiene formatos disponibles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "No se puede configurar con trabajos en proceso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Copiando base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Copiando biblioteca a "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Base de datos no valida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4892,24 +5195,24 @@ msgstr ""
 "<p>Ya existe una base de datos no valida en %s, bórrela antes de intentar "
 "mover la base de datos existente. <br>Error: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "No se puede mover la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "No hay información detallada disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "No hay información detallada disponible para los libros en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Error de comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4917,13 +5220,13 @@ msgstr ""
 "Hubo un error de comunicación con el dispositivo. Desconecte, vuelva a "
 "conectar el dispositivo y reinicie la aplicación."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Error de conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4931,15 +5234,15 @@ msgstr ""
 "<p>No se pudo convertir: %s<p>Es un libro con <a href=\"%s\">DRM</a>. "
 "Primero tienes que eliminar el DRM usando herramientas de una 3ª parte."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr "Ubicación de biblioteca no válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr "No se puede acceder a %s. Usando %s como biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4948,11 +5251,11 @@ msgstr ""
 "lo encuentras útil, por favor, considera donar dinero para soportar su "
 "desarrollo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Hay tareas activas. ¿Estás seguro de que quieres salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
@@ -4963,11 +5266,11 @@ msgstr ""
 "dispositivo.<br>\n"
 "                      '¿Estás seguro de que deseas salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr "AVISO: tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -4975,7 +5278,7 @@ msgstr ""
 "continuará ejecutándose en la bandeja del sistema. Para cerrarlo, elige "
 "<b>Salir</b> en el menú de contexto de la bandeja del sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4983,7 +5286,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Última versión: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Actualización disponible"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4993,31 +5300,27 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuevas "
 "características</a>. Visita la página de descarga?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Actualización disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr "Usar la biblioteca que está en la ruta especificada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr "Iniciar programa minimizado en la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr "Información del log de depuración a consola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "Salida:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
@@ -5025,19 +5328,19 @@ msgstr ""
 "Dar formato de salida que se usa cuando se convierten libros-e y se "
 "descargan noticias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Búsqueda avanzada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Buscar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -5045,7 +5348,7 @@ msgstr ""
 "Busca libros por título o autor. <br><br>Los espacios entre palabras se "
 "sustituyen por AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -5053,115 +5356,111 @@ msgstr ""
 "Buscar libros por título, autor, editorial, etiquetas y "
 "comentaris<br><br>Los espacios entre parlabras se sustituyen por AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Reinicializar búsqueda rápida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Emparejar con alguna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Emparejar con todas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Ordenar por &popularidad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Añadir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Suprimir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Editar la meta-información"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Descargar noticias (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Convertir libros-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr "Abrir carpeta contenedora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr "Mostrar detalles del libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Libros con mismo autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Libros de esta serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr "Libros de esta editorial"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Libros con las mismas etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr "Envía el formato específico al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
-msgstr ""
+msgstr "Configurar calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
-msgstr ""
+msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:18
 msgid ""
@@ -5354,86 +5653,88 @@ msgstr "El tamaño de letra de monospace en px"
 msgid "The standard font type"
 msgstr "El tipo de letra estándar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Ir a..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Posición en el libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Desconocido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 "Ve a referencia. Para obtener los número de referencia, usa el modo "
 "referencia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Buscar en el texto del libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "Elegir libro-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "Libros-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Añadir marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Introduce el título del marcador:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr "No se encontraron correspondencias para: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "Cargando flujo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr "Diseñando %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "Cargando libro-e..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Este libro está protegido por <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "Error DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "No se puede abrir el libro-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr "Opciones para controlar el visor de libros-e"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
+"Si está especificada, la ventana del visor intentará situarse en el frente "
+"cuando se inicie el programa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5487,15 +5788,15 @@ msgstr "Marcador"
 msgid "Toggle full screen"
 msgstr "Activar/Desactivar pantalla completa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Expresión regular no válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Expresión regular no valida: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5505,7 +5806,7 @@ msgstr ""
 "%d\n"
 "libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
@@ -5515,7 +5816,7 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
@@ -5525,15 +5826,15 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Haga click para ver la lista de libros disponibles en su ordenador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr "Haga click para ver la lista de libros disponibles en su lector"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Haga click para ver la lista de libros en la tarjeta de almacenamiento de su "
@@ -5991,6 +6292,10 @@ msgstr "No se ha podido negociar período de sesiones SSH: "
 msgid "Failed to authenticate with server: %s"
 msgstr "No se ha podido autenticar con el servidor: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr "Controlar envío de correo"
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -6287,34 +6592,41 @@ msgstr "Error en la descarga del artículo: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Obteniendo canales de noticias"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "Español"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Croata"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Serbio"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6362,7 +6674,7 @@ msgstr "Español"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6414,27 +6726,35 @@ msgstr "Español"
 msgid "English"
 msgstr "Inglés"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "Serbio"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Español"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "Francés"
 
@@ -6443,6 +6763,10 @@ msgstr "Francés"
 msgid "Dutch"
 msgstr "Neerlandés"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr "Bosnio"
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6453,7 +6777,7 @@ msgstr "Portugués"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6464,10 +6788,6 @@ msgstr "Alemán"
 msgid "Kovid Goyal"
 msgstr "Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "Croata"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "Italiano"
@@ -6572,6 +6892,23 @@ msgstr "Mostrar información de salida detallada. Útil para la depuración"
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "&Prioridad para los trabajos de conversión:"
 
+#~ msgid "Cannot connect"
+#~ msgstr "No se puede conectar"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Especifica una clave de acceso válida para isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Buscando metadatos para <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Registraros gratuitamente en <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> para obtenir una clave de "
+#~ "acceso."
+
 #~ msgid "&Access Key;"
 #~ msgstr "Clave de &acceso;"
 
@@ -6656,9 +6993,6 @@ msgstr "Mostrar información de salida detallada. Útil para la depuración"
 #~ msgid "Cannot kill waiting jobs."
 #~ msgstr "No se pueden detener trabajos en espera"
 
-#~ msgid "Double click to <b>edit</b> me<br><br>"
-#~ msgstr "Doble click para <b>editarme</b><br><br>"
-
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Los cambios no se aplicaran hasta reiniciar."
 
@@ -6882,6 +7216,9 @@ msgstr "Mostrar información de salida detallada. Útil para la depuración"
 #~ "command es uno de:\n"
 #~ "%s\n"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Error de obtención de metadatos"
+
 #~ msgid ""
 #~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 #~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -6959,6 +7296,9 @@ msgstr "Mostrar información de salida detallada. Útil para la depuración"
 #~ "(en un archivo opf). Puede obtener los numeros id a partir del comando list. "
 #~ "\n"
 
+#~ msgid "Send to storage card by default"
+#~ msgstr "enviar a la tarjeta de almacenamiento por defecto"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "&Número de portadas a mostrar en modo de navegación (después reiniciar):"
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index fa4a3e38e9..24bb67bbd4 100644
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-03-15 22:28+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-26 21:48+0000\n"
 "Last-Translator: Vincent C. <Unknown>\n"
 "Language-Team: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Ne fait strictement rien"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Lecture des méta-données depuis les fichiers %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
-msgstr "Extraction de la couverure depuis des fichiers de bandes dessinées"
+msgstr "Extraction de la couverture depuis des fichiers de bandes dessinées"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lecture des méta-données des ebooks contenus dans les archives ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lecture des méta-données des ebooks contenus dans les archives RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Définir les méta-données des fichiers %s"
 
@@ -167,11 +175,11 @@ msgstr "Plugins installés"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Mapping for filetype plugins"
-msgstr ""
+msgstr "Liaisons pour les plugins d'import/export"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Local plugin customization"
-msgstr "Personnalisation des greffons locaux"
+msgstr "Personnalisation des plugins locaux"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Disabled plugins"
@@ -179,11 +187,11 @@ msgstr "Plugins désactivés."
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
 msgid "No valid plugin found in "
-msgstr "Absence de greffon valide "
+msgstr "Absence de plugin valide "
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:185
 msgid "Initialization of plugin %s failed with traceback:"
-msgstr "L'initialisation du greffon %s a échoué en laissant une trace :"
+msgstr "L'initialisation du plugin %s a échoué en laissant une trace:"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:262
 msgid ""
@@ -194,7 +202,7 @@ msgid ""
 msgstr ""
 "    %prog options\n"
 "    \n"
-"    Personnaliser calibre à l'aide de greffons externes\n"
+"    Personnaliser calibre à l'aide de plugins externes\n"
 "    "
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:268
@@ -205,8 +213,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:270
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
-"Suppression d'un greffon personnalisé d'après son nom. Ceci n'a pas d'effet "
-"sur les greffons intégrés."
+"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:272
 msgid ""
@@ -218,29 +226,29 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:274
 msgid "List all installed plugins"
-msgstr "Liste tout les greffons installés"
+msgstr "Lister tous les plugins installés"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:276
 msgid "Enable the named plugin"
-msgstr "Active le greffon nommé"
+msgstr "Activer le plugin nommé"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
 msgid "Disable the named plugin"
-msgstr "Désactive le greffon nommé"
+msgstr "Désactive le plugin nommé"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Le lecteur n'a pas de carte mémoire connectée."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Espace insuffisant sur la carte mémoire"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Espace insuffisant dans la mémoire principale"
 
@@ -255,7 +263,7 @@ msgstr "Impossible de détecter le disque %s. Essayer de redémarrer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:94
 msgid "Options to control the conversion to EPUB"
-msgstr "Option pour la conversion en EPUB"
+msgstr "Options pour la conversion en EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
@@ -366,9 +374,9 @@ msgid ""
 "XPath expression to detect page boundaries for building a custom pagination "
 "map, as used by AdobeDE. Default is not to build an explicit pagination map."
 msgstr ""
-"Expression EPath servant à déterminer les limites de la page afin de créer "
-"une carte de pagination personnalisée, telle qu'utilisée dans AdobeDE. Par "
-"défaut, aucune carte de pagination explicite n'est crée."
+"Expression XPath servant à déterminer les limites de la page afin de créer "
+"une pagination personnalisée, telle qu'utilisée dans AdobeDE. Par défaut, "
+"aucune pagination explicite n'est crée."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
@@ -376,9 +384,9 @@ msgid ""
 "relative to its boundary element. Default is to number all pages staring "
 "with 1."
 msgstr ""
-"Expression XPath servant à déterminer le nom de chaque page dans la carte de "
+"Expression XPath servant à déterminer le nom de chaque page dans la "
 "pagination en relation avec l'élément voisin. Par défaut, les pages sont "
-"numérotées à compter de 1."
+"numérotées à partir de 1."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:165
 msgid ""
@@ -468,6 +476,9 @@ msgid ""
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
+"Normalement, si le fichier source a déjà une table des matières, elle est "
+"utilisée de préférence à celle auto-générée. Avec cette option, l'auto-"
+"générée est toujours utilisée."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:202
 msgid "Control page layout"
@@ -539,7 +550,7 @@ msgstr "Imprimer le fichier OPF généré vers le flux de sortie standard."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:234
 msgid "Print generated NCX file to stdout"
-msgstr "Imprimer le fichier OPF généré vers le flux de sortie standard."
+msgstr "Imprimer le fichier NCX généré vers le flux de sortie standard."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:237
 msgid "Keep intermediate files during processing by html2epub"
@@ -550,7 +561,7 @@ msgstr ""
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
-"Extrait le contenu du fichier EPUB produit vers un répertoire spécifique."
+"Extrait le contenu du fichier EPUB produit vers le répertoire spécifié."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:186
 msgid ""
@@ -559,12 +570,15 @@ msgid ""
 "Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
+"%%prog[options]nom du fichier\n"
+"Convertir un grand nombre de formats d'ebook vers un fichier %s. Les formats "
+"supportés sont : %s\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:105
 msgid "Could not find an ebook inside the archive"
 msgstr "Ne trouve pas d'ebook dans l'archive"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -581,14 +595,14 @@ msgstr ""
 "Si vous spécifier un fichier OPF à la place d'un fichier HTML, la liste des "
 "liens provient de l'élément <spine> du fichier OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "La sortie est écrite vers "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Vous devez spécifier un fichier HTML en entrée"
 
@@ -599,38 +613,36 @@ msgstr "Les livres au format %s ne sont pas supportés"
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:30
 msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
-msgstr ""
-"Impossible de trouver raisonnablement un point où effectuer la division: %s "
-"Taille du sous-noeud: %d Ko"
+msgstr "Pas trouvé d'endroit où scinder: branche %s taille: %d KB"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:142
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
-"\t\tTrop de marqueurs. Diviser à nouveau sans préserver la structure. Ceci "
-"peut entrainer un rendu incorrect."
+"\t\tTrop de balises. Re-scission sans préservation de la structure. Cela "
+"peut occasionner un mauvais rendu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Ecrit le HTML généré vers "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
-msgstr ""
+msgstr "options pour contrôler le parcours HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Répertoire de sortie. Par défaut, le répertoire courant."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Encodage de caractères pour des fichiers HTML. Par défaut, détection "
 "automatique."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -638,17 +650,19 @@ msgstr ""
 "Envoyer le flux de sortie vers un fichier zip. Si cette option est "
 "spécifiée, la sortie doit être un nom de fichier et non un répertoire."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Gère le suivi les liens dans les fichiers HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
+"parcourt les liens html en parallèle. Normalement, les liens sont parcourus "
+"en profondeur."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -657,39 +671,39 @@ msgstr ""
 "Doit être positif. 0 indique qu'aucun lien ne sera suivi dans le fichier "
 "HTML racine."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Changer les méta-données de l'ebook généré"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Changer le titre. La valeur par défaut est l'autodétection."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "Une liste des auteurs de ce livre, séparés par des &."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Une liste des sujets de ce livre, séparés par des virgules."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Changer l'éditeur du livre"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Un résumé de ce livre"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Lire les méta-données à partir du fichier OPF spécifié."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Options utiles pour le débogage"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -697,13 +711,13 @@ msgstr ""
 "Plus verbeux lors du traitement. Peux être spécifié plusieurs fois afin "
 "d'augmenter le niveau de verbosité."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "La sortie HTML est \"imprimée plus joliment\" afin de faciliter l'analyse "
 "par les humains"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -732,13 +746,14 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [options] FichierLit"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Dossier de récupération. Par défaut, il s'agit du dossier actuel."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:898
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
 msgstr ""
+"formatte en clair les balises. Peut modifier des espaces significatifs."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:901
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:731
@@ -747,7 +762,7 @@ msgid "Useful for debugging."
 msgstr "Utile pour déboguer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "ebook OEB créé dans"
 
@@ -792,9 +807,9 @@ msgid "Sort key for the author"
 msgstr "Clé de tri pour l'auteur"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Éditeur"
 
@@ -831,6 +846,10 @@ msgid ""
 "option obsoletes the --font-delta option and takes precedence over it. To "
 "use --font-delta, set this to 0. Default: %defaultpt"
 msgstr ""
+"Spécifie la taille de la fonte de base en pts. Toutes les fontes sont "
+"redimensionnées en fonction. Cette fonction a précédence sur l'option --font-"
+"delta et la rend obsolète. Pour utiliser --font-delta, mettre celle-ci à 0. "
+"Par défaut: %defaultpt"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:103
 msgid "Enable autorotation of images that are wider than the screen width."
@@ -860,17 +879,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:114
 msgid "Add extra spacing below the header. Default is %default px."
 msgstr ""
-"Ajoute un espacement supplémentaire en dessous de l'entête. Par défaut : "
-"%default.px."
+"Ajouter un espacement supplémentaire en dessous de l'entête. Par défaut : "
+"%default px"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:116
 msgid ""
 "Override the CSS. Can be either a path to a CSS stylesheet or a string. If "
 "it is a string it is interpreted as CSS."
 msgstr ""
-"Ne pas tenir compte du CSS. Peut être soit un chemin vers une feuille de "
-"style CSS ou une chaîne de caractères. Si c'est une chaîne, elle est "
-"interprétée comme du CSS."
+"Impose un CSS externe. Peut être soit un chemin vers une feuille de style "
+"CSS ou une chaîne de caractères. Si c'est une chaîne, elle est interprétée "
+"comme du CSS."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:118
 msgid ""
@@ -897,7 +916,7 @@ msgid ""
 "font size is decreased."
 msgstr ""
 "Augmente la taille de la police de 2 * FONT_DELTA pts et l'interligne de "
-"FONT_DELTA points. FONT_DELTA peut-être un nombre décimal. Si FONT_DELTA est "
+"FONT_DELTA points. FONT_DELTA peut être un nombre décimal. Si FONT_DELTA est "
 "négatif, la taille de la police est réduite."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:127
@@ -965,7 +984,7 @@ msgid ""
 "A regular expression. <a> tags whose href matches will be ignored. Defaults "
 "to %default"
 msgstr ""
-"Une expression habituelle. Les étiquettes <a> ayant leur href qui correspond "
+"Une expression régulière. Les étiquettes <a> ayant leur href qui correspond "
 "seront ignorées. Par défault: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:162
@@ -994,6 +1013,13 @@ msgid ""
 "attribute to \"none\" to match only on tag names. So for example, to match "
 "all h2 tags, you would use \"h2,none,\". Default is %default"
 msgstr ""
+"Détecte un chapitre commençant à un élément avec l'attribut spécifié. Le "
+"format pour cette option est un regexp de tag, un nom d'attribut, un regexp "
+"de valeur d'attribut. Par exemple pour détecter tous les tags de titre qui "
+"ont pour attribut class=\"chapter\" vous devrez user de \"h\\"
+"d,class,chapter\". Vous pouvez mettre l'attribut à \"none\" pour détecter "
+"uniquement les noms de tags. Par exemple pour détecter tous les tags h2, "
+"vous devrez user de \"h2,none,\". Par défaut: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:174
 msgid ""
@@ -1007,10 +1033,10 @@ msgid ""
 msgstr ""
 "Si html2lrf ne trouve aucun saut de page dans le fichier html et ne peut pas "
 "détecter de chapitres, il insèrera automatiquement des sauts de pages avant "
-"les tags dont le nom respectent cette expression régulière. Par défaut : "
+"les tags dont les nom respectent cette expression régulière. Par défaut : "
 "%default. Vous pouvez désactiver cette fonction en saisissant \"$\". Le but "
 "de cette option est d'essayer de s'assurer qu'il n'y a pas de vraiment trop "
-"longues pages, car cela dégrades les performances lorsque l'on change de "
+"longues pages, car cela dégrade les performances lorsque l'on change de "
 "page. De ce fait, cette option est ignorée si la page courante a peu "
 "d'éléments."
 
@@ -1150,7 +1176,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Echec du traitement de la bd : %s\n"
+"Échec du traitement de la bande dessinée : %s\n"
 "\n"
 "%s"
 
@@ -1192,6 +1218,8 @@ msgstr ""
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
+"Désactiver l'effet de normalisation (améliore le contraste) de la gamme de "
+"couleurs pour les images. Par défaut : False"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
@@ -1199,41 +1227,54 @@ msgstr "Maintient le ratio pour l'image. Par défaut : Plein écran."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid "Disable sharpening."
-msgstr ""
+msgstr "Désactiver l'effet d'accentuation."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Disable trimming of comic pages. For some comics, trimming might remove "
 "content as well as borders."
 msgstr ""
+"Désactive le découpage des pages de BD. Pour certaines BD, le découpage peut "
+"supprimer le contenu aussi bien que les bordures."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
+"Ne pas diviser les images au format paysage en deux images au format portrait"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
+"Garde la proportion d'image et redimensionne en utilisant la hauteur d'écran "
+"comme largeur d'image en mode paysage."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
+"Utilisé pour les publications affichées de droite à gauche comme les mangas. "
+"Peut entrainer une division des pages au format paysage en pages au format "
+"portrait affichées de droite à gauche."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:317
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
+"Autoriser le flou. Réduit le bruit. Peut augmenter sensiblement les durées "
+"d'exécutions."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:319
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
+"Ne pas trier les fichiers trouvés dans la bande-dessinée par nom et dans "
+"l'ordre alphabétique. Utiliser plutôt l'ordre dans lequel ils ont été "
+"ajoutés dans la bande dessinée."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:321
 msgid ""
@@ -1279,7 +1320,7 @@ msgstr "La sortie est écrite vers"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:553
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_comic.py:35
 msgid "Rendering comic pages..."
-msgstr ""
+msgstr "Rendu pour les pages de bandes dessinées..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/epub/convert_from.py:17
 msgid ""
@@ -1328,7 +1369,7 @@ msgstr "Échec du téléchargement de la recette : "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:321
 msgid "\tBook Designer file detected."
-msgstr ""
+msgstr "\tFichier de design du livre détecté"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:323
 msgid "\tParsing HTML..."
@@ -1607,6 +1648,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:48
 msgid "Could not find pdftohtml, check it is in your PATH"
 msgstr ""
+"Impossible de trouver le programme pdfhtml, vérifier qu'il est bien dans "
+"votre PATH"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:74
 msgid ""
@@ -1683,73 +1726,73 @@ msgstr "Configurer les auteurs."
 msgid "Set the comment"
 msgstr "Configurer les commentaires."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Titre"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Producteur"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Commentaires"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Etiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Séries"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Langue"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Horodatage"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
 msgid "A comma separated list of tags to set"
-msgstr ""
+msgstr "Indiquer une liste d'étiquettes séparées par des virgules"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:204
 msgid "The series to which this book belongs"
-msgstr ""
+msgstr "Collection à laquelle le livre appartient"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:206
 msgid "The series index"
@@ -1873,9 +1916,9 @@ msgstr "Indiquer la langue"
 msgid "Set the ISBN"
 msgstr "Indiquer l'ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
-msgstr ""
+msgstr "Indiquer le champ dc:language"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:58
 msgid "Usage: pdf-meta file.pdf"
@@ -1889,13 +1932,13 @@ msgstr "Utilisation: rb-meta fichier.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "Créé le fichier Mobipocket à partir de l'EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] myebook.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
-msgstr ""
+msgstr "HTML MOBI brut sauvegardé dans"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:534
 msgid "Options to control the conversion to MOBI"
@@ -1916,32 +1959,37 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:546
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
-"Modifie les images pour qu'elle corresponde à la limitation de taille des "
-"Palm"
+"Modifier les images pour qu'elles correspondent à la limitation de taille "
+"des Palm"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:548
 msgid "Title for any generated in-line table of contents."
-msgstr ""
+msgstr "Titre pour les tables des matières générées."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:554
 msgid ""
 "When present, use the author sorting information for generating the "
 "Mobipocket author metadata."
 msgstr ""
+"Quand il est présent, utilise l'information de tri par auteur pour générer "
+"la méta-donnée auteur Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:556
 msgid ""
 "Device renderer profiles. Affects conversion of font sizes, image rescaling "
 "and rasterization of tables. Valid profiles are: %s."
 msgstr ""
+"Rendu pour les profils de l'appareil. Affecte les conversions pour les "
+"tailles de fontes, échantillonnage d'image et la rasterisation des tables. "
+"Les profils valides sont: %s."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:561
 msgid "Source renderer profile. Default is %default."
-msgstr ""
+msgstr "Profil source du rendu. Par défaut : %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:564
 msgid "Destination renderer profile. Default is %default."
-msgstr ""
+msgstr "Profil de destination du rendu. Par défaut : %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:572
 msgid "[options]"
@@ -1949,7 +1997,7 @@ msgstr "[options]"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:590
 msgid "Unknown source profile %r"
-msgstr ""
+msgstr "Profil source inconnu %r"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:594
 msgid "Unknown destination profile %r"
@@ -1992,7 +2040,7 @@ msgstr "Bibliographie"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:829
 msgid "Colophon"
-msgstr ""
+msgstr "Marque de l'imprimeur"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:830
 msgid "Copyright"
@@ -2037,24 +2085,34 @@ msgstr "Options pour contrôler la transformation en pdf"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:24
 msgid "Number of pixels to crop from the left most x (default is %d) "
 msgstr ""
+"Nombre de pixels sur l'axe x à partir desquels couper à gauche (%d par "
+"défaut) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:26
 msgid "Number of pixels to crop from the left most y (default is %d) "
 msgstr ""
+"Nombre de pixels sur l'axe y à partir desquels couper à gauche (%d par "
+"défaut) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:28
 msgid "Number of pixels to crop from the right most x (default is %d) "
 msgstr ""
+"Nombre de pixels sur l'axe x à partir desquels couper à droite (%d par "
+"défaut) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:30
 msgid "Number of pixels to crop from the right most y (default is %d)"
 msgstr ""
+"Nombre de pixels sur l'axe y à partir desquels couper à droite (%d par "
+"défaut)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:32
 msgid ""
 "A file generated by ghostscript which allows each page to be individually "
 "cropped [gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox > bounding] "
 msgstr ""
+"Un fichier généré par ghostscript permettant à chaque page d'être coupée "
+"individuellement [gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox > bounding] "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:38
 msgid ""
@@ -2063,104 +2121,116 @@ msgid ""
 "\tCrops a pdf. \n"
 "\t"
 msgstr ""
+"\t%prog [options] fichier.pdf\n"
+"\t\n"
+"\tdécoupe un pdf. \n"
+"\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Répertoires utilisés fréquemment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
-"Par défaut, envoie le fichier dans la carte de stockage à la place de la "
+"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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
-"Le format à utiliser lors de la sauvegarde de simples fichier sur disque"
+"Format à utiliser pour la sauvegarde des fichiers simples sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Confirmer avant la suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Taille de la barre d'icone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Affiche les libellés dans la barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
-msgstr ""
+msgstr "Géométrie de l'écran principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 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:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Trier la liste des étiquettes par popularité"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 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:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Options pour l'afficheur d'ebook LFR"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 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:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "Anciennes informations conservées dans la base"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Afficher l'icône dans la zone de notification"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Télécharge les dernières informations vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 "Supprime les livres de la librairie après les avoir téléchargés dans "
 "l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 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:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+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/add.py:87
 msgid "Added %s to library"
 msgstr "%s a été ajouté à la librairie"
@@ -2188,7 +2258,7 @@ msgstr "Des doublons ont été détectés !"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:146
 msgid "Adding books recursively..."
-msgstr "Ajoute les livres récursivement"
+msgstr "Ajouter des livres récursivement..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:147
 msgid "Searching for books in all sub-directories..."
@@ -2196,10 +2266,10 @@ msgstr "Recherche les livres dans tous les sous-répertoires"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:176
 msgid "Adding books to database..."
-msgstr "Ajoute les livres dans la base..."
+msgstr "Ajoute des livres dans la base de données..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "Lit les méta-données..."
 
@@ -2207,43 +2277,189 @@ msgstr "Lit les méta-données..."
 msgid "Searching in"
 msgstr "Recherche dans"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "L'appareil n'est plus connecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Lit les informations de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Lire la liste de livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Envoie les méta-données vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Envoie le livre %d dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Supprime les livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Télécharge les livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Afficher le livre sur l'appareil"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "et supprimer de la librairie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr "Indiquer l'action par défaut pour 'envoyer au lecteur'"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr "Email vers"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Envoyer vers la mémoire du lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Envoyer vers la carte mémoire"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr "Envoyer le format spécifique vers la mémoire principale"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr "Envoyer le format spécifique vers la carte mémoire"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr "Aucun livre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr "sélectionné pour l'envoi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr "Choisir le format à envoyer au lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr "Aucun appareil"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr "Impossible d'envoyer: Aucun appareil connecté"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr "Aucune carte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+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:449
+msgid "E-book:"
+msgstr "E-book:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr "En pièce jointe, vous trouverez l'ebook"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "par"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr "dans le format %s."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr "Envoi d'un email à"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Pas de format convenable"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+"Impossible d'envoyer par email les livres suivants car aucun format "
+"convenable n'a été trouvé :<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr "L'envoi par email des livres a échoué"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr "L'envoi par email des livres suivants a échoué:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr "Envoyer par email:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr "News:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr "Envoi des News vers"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Envoi les News vers l'appareil."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Envoie les livres dans l'appareil."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Impossible de télécharger les livres suivants dans l'appareil, car aucun "
+"format convenable n'a été trouvé : <br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+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:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Impossible d'envoyer les livres sur le lecteur : il n'y a plus assez "
+"d'espace mémoire disponible "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Chemin"
@@ -2252,7 +2468,8 @@ msgstr "Chemin"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2317,15 +2534,15 @@ msgstr "&Profil :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 msgid "Disable &normalize"
-msgstr ""
+msgstr "désactive &normalize"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 msgid "Keep &aspect ratio"
-msgstr ""
+msgstr "Garde proportion &aspect"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
 msgid "Disable &Sharpening"
-msgstr ""
+msgstr "Désactive &Sharpening"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
 msgid "&Landscape"
@@ -2341,37 +2558,39 @@ msgstr "De d&roite à gauche"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102
 msgid "De&speckle"
-msgstr ""
+msgstr "&Flou"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
 msgid "&Wide"
-msgstr ""
+msgstr "&Large"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
 msgid "Disable &Trimming"
+msgstr "Désactive &Trimming"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
+msgid " plugins"
+msgstr " Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
-msgid " plugins"
-msgstr " plugins"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "par"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Mode avancé"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Général"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Interface"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Mode avancé"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2379,104 +2598,156 @@ msgstr ""
 "Serveur de\n"
 "contenu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr "Envoyer automatiquement"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr "Email"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+msgid ""
+"If checked, downloaded news will be automatically mailed <br>to this email "
+"address (provided it is in one of the listed formats)."
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr "Nouvelle adresse email"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr "Termine le paramétrage de gmail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+"N'oubliez pas d'entrer votre nom d'utilisateur et votre mot de passe gmail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr "Mauvaise configuration"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+"Vous devez indiquer le nom d'utilisateur et le mot de passe pour le serveur "
+"de mail."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Pas de répertoire valide pour les plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s n'est pas un répertoire valide pour les plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Choisir le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "Le plugin ne peut pas être désactivé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "Le plugin %s ne peut pas être désactivé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Le plugin ne peut pas être personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "Le plugin %s ne peut pas être personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Personnalise %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
-msgstr "Ne peut pas retirer les plugins natif"
+msgstr "Impossible de supprimer les plugins natifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " ne peut pas être retiré. C'est un plugin natif. Essayer plutôt de le "
 "désactiver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
-msgstr ""
+msgstr "Journal d'erreur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
-msgstr ""
+msgstr "Journal des accès:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
-msgstr ""
+msgstr "A échoué lors du démarrage du serveur de contenu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr "Sélectionner l'emplacement de la base de données"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Taille invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "La taille %s est invalide. Doit être au format largeurxhauteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Chemin de la database invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Doit être un répertoire."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Chemin de la database invalide "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Doit être un répertoire."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Chemin de la database invalide.<br>Erreur en écriture "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Compacte la base. Cela peut prendre un certains temps."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Compactage en cours..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Compacte la base. Cela peut prendre un certains temps."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Configuration"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2484,16 +2755,16 @@ msgstr ""
 "&Localisation des ebooks (Les ebooks sont stockés dans les répertoires triés "
 "par auteur et les méta-données sont stockées dans le fichier metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Choisir un nouvel emplacement pour la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2511,18 +2782,18 @@ msgstr "Choisir un nouvel emplacement pour la base de données"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Envoyer une notification quand une nouvelle version est disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
@@ -2530,133 +2801,257 @@ msgstr ""
 "Si vous désactivez ce paramètre, les méta-données proviennent du fichier. "
 "Ceci peut être configuré dans la section avancée."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Lire les &méta-données à partir des fichiers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
-msgstr "Format pour la sauvegarde d'un fichier &seul"
+msgstr "Format pour la sauvegarde d'un &seul fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "&Timeout par défaut pour les connexions réseau :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
+"Indiquer le timeout  par défaut pour les recherches réseau (c-à-d le temps "
+"utilisé pour aller rechercher l'information par internet)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " secondes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Choisir la &langue (nécessite un redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Haute"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Basse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "&Priorité du travail:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Ajouter un répetoire à la liste des répertoires utilisés fréquemment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 "Supprime un répetoire de la liste des répertoires utilisés fréquemment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Utiliser les chiffres &romains pour les numéros de séries"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
+"Ac&tiver l'affichage dans la zone de notification (redémarrage nécessaire)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr "Afficher les alertes dans la zone de &notification"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
+"Afficher la navigation par couverture dans une fenêtre séparée (redémarrage "
+"nécessaire)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Envoyer automatiquement les i&nformations vers le lecteur d'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 "Supprime les informations de la librairie après l'envoi vers le lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Nombre de couvertures à afficher dans le mode navigation (nécessite un "
 "redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Large"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Moyen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Petit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "Taille des boutons dans la barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Afficher le &texte pour les boutons de la barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Sélectionne les &colonnes visibles dans la vue librairie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Utilise l'afficheur interne pour:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+"calibre peut envoyer vos livres vers vous (ou votre lecteur) par email"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr "Envoyer l'email de:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr "&Ajouter un email"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr "&Supprimer un email"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr "&Serveur de messagerie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+"calibre peut <b>optionnellement</b> utiliser un serveur pour envoyer les "
+"emails"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr "Nom d'&hôte:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr "Le nom d'hôte de votre serveur de messagerie. Par ex. smtp.gmail.com"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr "&Port:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr "Le port d'écoute de votre serveur de messagerie. Par défault: 25"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "Nom d'&utilisateur:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr "Votre nom d'utilisateur pour le serveur de messagerie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "Mot de &passe :"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr "Votre mot de passe pour le serveur de messagerie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr "&Visualiser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr "Cryptage:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+"Utiliser le cryptage TLS lors de la connexion au serveur de messagerie. "
+"Cette option est la plus utilisée."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr "&TLS"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+"Utiliser le cryptage SSL lors de la connexion au serveur de messagerie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr "&SSL"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr "Utiliser Gmail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Espace libre non-utilisé de la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Compacter la base"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Meta-données à partir du nom de fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2667,23 +3062,11 @@ msgstr ""
 "monde. Toutes modifications des paramètres ne prendra effet qu'après un "
 "redémarrage du serveur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "&Port du serveur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "Nom de l'&utilisateur :"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "Mot de &passe :"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2691,43 +3074,45 @@ msgstr ""
 "Si vous laisser le mot de passe à vide, tout le monde pourra accéder à votre "
 "collection de livres en utilisant une interface web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
-msgstr "&Affiche le mot de passe"
+msgstr "&Montrer le mot de passe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
+"Taille maximale (largeurxhauteur) pour l'affichage des couvertures. Les "
+"couvertures plus larges sont redimensionnées. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
-msgstr ""
+msgstr "Taille max. de la couverture:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "Démarrer le &Serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "Arrêter le serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Tester le serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "Lancer &automatiquement le serveur au démarrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Afficher les logs du &serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2741,7 +3126,7 @@ msgstr ""
 "votre iphone. Ici nomhote devrait être le nom d'hôte ou l'adresse IP de "
 "votre ordinateur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -2749,27 +3134,27 @@ msgstr ""
 "Ici vous pouvez personnaliser le comportement de Calibre en choisissant les "
 "plugins que vous souhaitez utiliser."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
-msgstr "Active/Désactive le plugin"
+msgstr "Activer/Désactiver le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
-msgstr "Personnalise le plugin"
+msgstr "Personnaliser le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
-msgstr "Supprime le plugin"
+msgstr "Supprimer le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
-msgstr "Ajoute un nouveau plugin"
+msgstr "Ajouter un nouveau plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Fichier plugin:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Ajouter"
 
@@ -2797,7 +3182,7 @@ msgstr "Convertir %s vers "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadata"
@@ -2829,15 +3214,21 @@ msgid ""
 "\n"
 "Metadata will be updated in the database as well as the generated %s file."
 msgstr ""
+"Spécifier les méta-données telles que le titre et l'auteur du livre.\n"
+"\n"
+"Les méta-données sont mise à jour dans la base de données et dans le fichier "
+"%s généré."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
 msgid ""
 "Adjust the look of the generated ebook by specifying things like font sizes."
 msgstr ""
+"Ajuste l'apparence du livre généré en spécifiant des paramètres comme la "
+"taille de fonte."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
 msgid "Specify the page layout settings like margins."
-msgstr ""
+msgstr "Spécifie des paramètres de mise en page comme les marges."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300
@@ -2847,30 +3238,30 @@ msgstr "Peaufiner la détection des chapitres et des en-têtes de section."
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167
 msgid "Choose cover for "
-msgstr "Choisir la couvertur pour "
+msgstr "Choisir la couverture pour "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Impossible de lire"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Vous n'avez pas les permissions nécessaires pour lire ce fichier: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Erreur à la lecture du fichier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Il y a eu une erreur à la lecture du fichier : <br /><b>"
 
@@ -2880,13 +3271,13 @@ msgid " is not a valid picture"
 msgstr " n'est pas une image vailde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Conversion impossible"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:243
 msgid "This book has no available formats"
-msgstr ""
+msgstr "Ce livre n'a pas de format disponible"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:248
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:93
@@ -2926,7 +3317,7 @@ msgstr "Couverture du livre"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:497
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
 msgid "Change &cover image:"
-msgstr "Modifie l'image &cover :"
+msgstr "Modifier l'image de la &couverture:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:470
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:498
@@ -2965,6 +3356,8 @@ msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
 "an &. If the author name contains an &, use && to represent it."
 msgstr ""
+"Changer les auteurs de ce livre. Les auteurs peuvent être séparés par un &. "
+"Si le nom de l'auteur contient un &, utiliser && à la place."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:477
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:505
@@ -3046,7 +3439,7 @@ msgstr "Livre "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:490
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:524
 msgid "Source en&coding:"
-msgstr ""
+msgstr "En&codage de la source:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:491
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
@@ -3071,7 +3464,7 @@ msgstr "Préserver la structure de l'étique&te lors des divisions"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:495
 msgid "&Rescale images"
-msgstr ""
+msgstr "&Redimensionner les images"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:496
 msgid "&Ignore tables"
@@ -3143,6 +3536,13 @@ msgid ""
 "pages in a paper book, to locations in the e-book. This controls where Adobe "
 "Digital Editions displays the page numbers in the right margin.</p>"
 msgstr ""
+"<p> Vous pouvez contrôler comment calibre détecte les limites de pages en "
+"utilisant une expression XPath. Pour apprendre comment utiliser des "
+"expressions Xpath voir <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">. Les limites "
+"de pages sont utiles seulement si vous voulez une transposition de la mise "
+"en page d'un livre dans le ebook. Cela contrôle l'endroit où Adobe Digital "
+"Editions affiche le numéro de page dans la marge de droite.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:516
 msgid "&Boundary XPath:"
@@ -3183,7 +3583,7 @@ msgstr "&Table des matières générée automatiquement"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:523
 msgid "Number of &links to add to Table of Contents"
-msgstr "Nombre de &liens ajoutés à la table des matières"
+msgstr "Nombre de &liens ajoutés à la Table des Matières"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:524
 msgid "Do not add &detected chapters to the Table of Contents"
@@ -3191,7 +3591,7 @@ msgstr "Ne pas ajouter les chapitres &détectés à la Table des Matières"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:525
 msgid "Chapter &threshold"
-msgstr ""
+msgstr "Seuil de chapi&tre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:526
 msgid "&Force use of auto-generated Table of Contents"
@@ -3213,57 +3613,62 @@ msgstr "&Titre pour la TDM générée"
 msgid "Level &3 TOC"
 msgstr "Niveau &3 TM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Triage Auteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Impossible de se connecter"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr "Cherche les méta-données..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Vous devez spécifier une clef d'accès valide à isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr "Impossible de trouver les méta-données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Erreur lors de la recherche de métadonnées"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+"Le téléchargement des méta-donnés semble s'être arrêté. Essayer de nouveau "
+"plus tard."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr "Avertissement"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr "Impossible de récupérer les méta-données de:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Aucune métadonnée trouvée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Aucune métadonnée trouvée, essayer en modifiant le titre et l'auteur ou la "
 "clé ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr "Récupération des metadata"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Récupération des metadata pour <b>%1</b>"
+msgid "Fetch metadata"
+msgstr "Récupération des meta-données"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Enregistrez-vous gratuitement sur <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> pour obtenir une clef d'accès "
-"(access key)."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
-msgstr ""
+msgstr "Clef d'&accès"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:81
 msgid "Fetch"
@@ -3471,6 +3876,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:550
 msgid "&Multiplier for text size in rendered tables:"
 msgstr ""
+"Coefficient &multiplicateur pour la taille du texte dans le rendu des tables:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:551
 msgid "Title based detection"
@@ -3486,15 +3892,15 @@ msgstr "Expression &Régulière :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:554
 msgid "Add &chapters to table of contents"
-msgstr "Ajout les &chapitres à la table des matières"
+msgstr "Ajouter les &chapitres à la Table des Matières"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:555
 msgid "Don't add &links to the table of contents"
-msgstr "Ne pas ajouter les &liens à la tables de matières"
+msgstr "Ne pas ajouter de &liens à la Table des Matières"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:556
 msgid "Tag based detection"
-msgstr "Détection basée sur des tags"
+msgstr "Détection basée sur des étiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:557
 msgid "&Page break before tag:"
@@ -3510,7 +3916,7 @@ msgstr "Force un saut de page avant l'&attribut :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:560
 msgid "Detect chapter &at tag:"
-msgstr ""
+msgstr "Détecter un chapitre à partir de l'étiquette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:561
 msgid ""
@@ -3525,6 +3931,16 @@ msgid ""
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
 "indent:0px;\"></p></body></html>"
 msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
@@ -3538,7 +3954,7 @@ msgstr "Informations (metadata)"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:335
 msgid "Author S&ort: "
-msgstr "Clé de tr&i de l'auteur : "
+msgstr "Clé de tr&i d'auteur: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:336
@@ -3579,11 +3995,12 @@ msgstr "Ouvre l'éditeur de mots-clefs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
-msgstr "&Supprime des mots-clefs :"
+msgstr "&Supprime des étiquettes :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
-msgstr "Liste de mots-clefs séparés par des virgules à retirer des livres. "
+msgstr ""
+"Liste d'étiquettes séparées par des virgules à supprimer des livres. "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
@@ -3591,35 +4008,35 @@ msgstr "Supprimer le &format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
 msgid "A&utomatically set author sort"
-msgstr ""
+msgstr "Effectuer un tri a&utomatique par auteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr "Aucun format sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr "Impossible de lire les méta-données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr "Impossible de lire les méta-données à partir du format %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr "Impossible de lire la couverture"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr "Impossible de lire la couverture à partir du format %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr "La couverture du format %s est invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3629,26 +4046,45 @@ msgstr ""
 "<b>LibraryThing.com</b>. <br/>Si vous n'en avez pas, vous pouvez <a "
 "href='http://www.librarything.com'>y créer un compte </a> gratuitement !</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr "Télécharge la couverture..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Erreur à la récupération de l'image de couverture"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Vous devez fournir l'identifiant ISBN de ce livre."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Erreur à la récupération de l'image de couverture.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Vous devez fournir l'identifiant ISBN de ce livre."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr "Timeout lors du téléchargement."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr "Mauvaise couverture"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr "La couverture n'est pas une image valide"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr "Impossible de récupérer les méta-données"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
+"Vous devez spécifier au moins un ISBN, un titre, des auteurs ou un éditeur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3662,6 +4098,8 @@ msgstr "Inverse l'auteur et le titre"
 msgid ""
 "Automatically create the author sort entry based on the current author entry"
 msgstr ""
+"Crée automatiquement la vedette de nom d'auteur à partir du nom d'auteur "
+"courant."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:351
 msgid "Remove unused series (Series that have no books)"
@@ -3674,7 +4112,7 @@ msgstr "I&SBN :"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
 msgid "&Fetch metadata from server"
-msgstr ""
+msgstr "&Récupérer les méta-données à partir du serveur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
 msgid "Available Formats"
@@ -3690,15 +4128,15 @@ msgstr "Retire les formats sélectionnés de ce livre de la base de données."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 msgid "Set the cover for the book from the selected format"
-msgstr ""
+msgstr "Indiquer la couverture pour le livre à partir du format sélectionné"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
 msgid "Reset cover to default"
-msgstr ""
+msgstr "Revenir à la couverture par défaut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid "Fetch &cover image from server"
-msgstr ""
+msgstr "Récupérer l'image de la &couverture à partir du serveur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
 msgid ""
@@ -3709,7 +4147,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 msgid "Change &password"
-msgstr ""
+msgstr "Changer le mot de passe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
 msgid "Password needed"
@@ -3730,84 +4168,85 @@ msgstr "Client"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr "Planifié"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Trouver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
-msgstr ""
+msgstr "%d recettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr "Lundi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr "jour"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr "Vendredi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr "Samedi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
-msgstr ""
+msgstr "Vous devez spécifiez des informations sur le compte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
-msgstr ""
+msgstr "Cette recette a besoin d'un nom d'utilisateur et d'un mot de passe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Créé par: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr "il y a %d jours, %d heures et %d minutes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr "Dernier téléchargé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Dernier téléchargé: jamais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
-msgstr ""
+msgstr "Planifier le téléchargement des News"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
-msgstr ""
+msgstr "Ajouter une source personnalisée de News"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3818,19 +4257,19 @@ msgstr "Informations"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
 msgid "Recipes"
-msgstr ""
+msgstr "Recettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:164
 msgid "Schedule for download"
-msgstr ""
+msgstr "Planifier le téléchargement"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:165
 msgid "blurb"
-msgstr ""
+msgstr "texte de présentation"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:166
 msgid "&Schedule for download:"
-msgstr ""
+msgstr "Planifier le téléchargement"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:169
@@ -3846,6 +4285,8 @@ msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
+"Intervalle pour le téléchargement de cette recette. Une valeur à zéro "
+"signifie que la recette sera téléchargée toutes les heures."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:179
@@ -3860,6 +4301,8 @@ msgstr "&Compte"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:176
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
+"Pour que la planification puisse s'exécuter, vous devez laisser calibre "
+"fonctionner."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:177
 msgid "&Download now"
@@ -3870,10 +4313,12 @@ msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
+"Supprimer les News téléchargées plus anciennes que le nombre de jours "
+"spécifiés. Indiquer zéro pour le désactiver."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:180
 msgid "Delete downloaded news older than "
-msgstr "Supprimer les informations téléchargés plus anciennes que "
+msgstr "Effacer les News plus anciennes que "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:96
@@ -3893,10 +4338,12 @@ msgid ""
 "<p>Negate this match. That is, only return results that <b>do not</b> match "
 "this query."
 msgstr ""
+"<p>exclut cette correspondance. Retourne uniquement les résultats <b>qui ne "
+"correspondent pas</b> à cette requête."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
-msgstr ""
+msgstr "Exclut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:88
 msgid "Advanced Search"
@@ -3940,7 +4387,7 @@ msgstr "Editeur de Mots-Clefs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
-msgstr "Mots-clefs disponibles"
+msgstr "Etiquettes disponibles"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
 msgid ""
@@ -3982,15 +4429,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:62
 msgid "No recipe selected"
-msgstr ""
+msgstr "Aucune recette sélectionnée"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:68
 msgid "The attached file: %s is a recipe to download %s."
-msgstr ""
+msgstr "Le fichier attaché: %s est une recette à télécharger %s."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
 msgid "Recipe for "
-msgstr ""
+msgstr "Recette pour "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:96
@@ -4025,7 +4472,7 @@ msgstr "Existe déjà"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:121
 msgid "This feed has already been added to the recipe"
-msgstr ""
+msgstr "Ce flux a déjà été ajouté à la recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:162
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:171
@@ -4037,59 +4484,60 @@ msgstr "Entrée invalide"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "<p>Could not create recipe. Error:<br>%s"
-msgstr ""
+msgstr "<p>Impossible de créer la recette. Erreur:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:178
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
 msgid "Replace recipe?"
-msgstr ""
+msgstr "Remplacer la recette?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
+"Une recette personnalisée nommée %s existe déjà. Voulez-vous la remplacer ?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:201
 msgid "Pick recipe"
-msgstr ""
+msgstr "Choisir une recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:201
 msgid "Pick the recipe to customize"
-msgstr ""
+msgstr "Choisir une recette à personnaliser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
 msgid "Choose a recipe file"
-msgstr ""
+msgstr "Choisir un fichier de recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
-msgstr ""
+msgstr "Ajouter une nouvelle source d'informations"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
-msgstr ""
+msgstr "Recettes utilisateur disponibles"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
-msgstr ""
+msgstr "Ajouter/Mettre à jour la &recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
-msgstr ""
+msgstr "Supp&rimer la recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
-msgstr ""
+msgstr "&Partager une recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
-msgstr ""
+msgstr "Personnaliser les recettes intégrées"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
-msgstr ""
+msgstr "&Charger une recette à partir d'un fichier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:256
 msgid ""
@@ -4107,7 +4555,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
-msgstr ""
+msgstr "&Titre de la recette:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
@@ -4127,16 +4575,16 @@ msgstr "Nombre maximum d'articles à télécharger par flux."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
-msgstr ""
+msgstr "Flux dans la recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
-msgstr ""
+msgstr "Supprimer un flux de la recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274
 msgid "Add feed to recipe"
-msgstr ""
+msgstr "Ajouter un flux dans la recette"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
@@ -4155,10 +4603,14 @@ msgid ""
 "For help with writing advanced news recipes, please visit <a "
 "href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
 msgstr ""
+"Pour avoir de l'aide concernant les recettes de News avancées, veuillez "
+"visiter les <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">Recettes "
+"utilisateur</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
-msgstr ""
+msgstr "Code source de la recette (python)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:97
 msgid ""
@@ -4235,11 +4687,11 @@ msgstr "Expression régulière (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Pas de correspondance"
 
@@ -4325,52 +4777,58 @@ msgstr ""
 msgid "Job has already run"
 msgstr "Le travail a déjà démarré"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
-msgid "Size (MB)"
-msgstr "Taille (MB)"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
+msgid "Size (MB)"
+msgstr "Taille (Mo)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Date"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Note"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Aucun"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Livre <font face=\"serif\">%s</font> of %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "Interdit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
+"Déplacer vers un appareil n'est pas supporté. Ajouter d'abord le livre dans "
+"la librairie calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Double clic pour m' <b>éditer</b><br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 "Recherche (pour une recherche avancée cliquer sur le bouton à gauche)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
-msgstr "Configuration du visualisateur"
+msgstr "Configurer l'afficheur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
@@ -4393,7 +4851,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Aucun résultat</b> pour la recherche <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Aucun résultat"
 
@@ -4438,25 +4896,25 @@ msgstr "Ouvrir le livre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
-msgstr "Configuration"
+msgstr "Configurer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Montrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr "&Donner pour supporter calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Redémarrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4464,131 +4922,112 @@ msgstr ""
 "<p>Pour l'aide visiter <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s par <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Envoi vers la mémoire du lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Envoi vers la carte mémoire"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "et supprimer de la librairie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Envoyer vers la carte de stockage par défaut"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Editer les méta-données individuellement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Editer les méta-données par lot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
-msgstr "Ajout de livres à partir d'un répertoire"
+msgstr "Ajouter des livres à partir d'un répertoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 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 ""
-"Ajout de livres à partir de répertoires et sous-répertoires. (Un livre par "
-"répertoire, chaque fichier représente le même livre dans différent format)"
+"Ajouter des livres par répertoires et sous-répertoires. (Un livre par "
+"répertoire, chaque fichier représente le même livre dans un format différent)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
-"Ajout de livres à partir de répertoires et sous-répertoires. (Plusieurs "
-"livres par répertoire, chaque fichier est un livre différent)"
+"Ajouter des livres par répertoires et sous-répertoires. (Plusieurs livres "
+"par répertoire, chaque fichier est un livre différent)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Sauvegarder sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Sauvegarder sur le disque dans un seul répertoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Sauvegarder seulement le format %s vers le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Visualiser le format spécifique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
-msgstr "Conversion individuelle"
+msgstr "Convertir individuellement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
-msgstr "Conversion par lot"
+msgstr "Convertir par lot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Indiquer les valeurs par défaut pour la conversion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 "Indiquer les valeurs par défaut pour la conversion des bandes dessinées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Livres similaires..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Mauvais emplacement pour la base"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Choisir un emplacement pour votre librairie d'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr "Navigation par couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Appareil: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " detecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Connecté: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Base de données d'appareils corrompue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4603,68 +5042,70 @@ msgid ""
 "                </ol>\n"
 "                "
 msgstr ""
+"\n"
+"                <p>La base de données sur le lecteur est corrompue. Essayer "
+"ceci:\n"
+"                <ol>\n"
+"                <li>Débrancher le lecteur. Attendre qu'il regénère la base "
+"de données (c-à-d attendre jusqu'à ce qui soit prêt à être utiliser). "
+"Brancher le. Maintenant, cela devrait fonctionner avec %(app)s. Si cela ne "
+"fonctionne pas, essayer l'étape suivante.</li>\n"
+"                <li>Quitter %(app)s. Trouver le ficher media.xml dans la "
+"mémoire principale du lecteur. Supprimer le. Débrancher le lecteur. Attendre "
+"qu'il regénère la base de données. Le reconnecter et démarrer %(app)s.</li>\n"
+"                </ol>\n"
+"                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Téléchargement des livres vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "Livres EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "Livres LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "Livres HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "Livres LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "Livres MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Livres Texte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "Livres PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Bande Dessinées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
-msgstr ""
+msgstr "Archives"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr "Ajoute les livres..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Le lecteur électronique n'a plus d'espace mémoire disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>Impossible d'envoyer les livres sur le lecteur : il n'y a plus assez "
-"d'espace mémoire disponible "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -4672,61 +5113,39 @@ msgstr ""
 "Les livres sélectionnés vont être <b>supprimés définitivement</b> et les "
 "fichiers seront supprimés de votre ordinateur. Etes-vous sûr ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Suppression des livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Erreur à l'édition des metadat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Aucun livre sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr "Choisir le format à envoyer à l'appareil"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Envoie les livres dans l'appareil."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Pas de format convenable"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Impossible de sauvegarder sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr "Enregistrement vers le disque..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr "Sauvegardé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Choisir le répertoire de destination"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4734,64 +5153,64 @@ msgstr ""
 "<p>Impossible de sauvegarder les fichiers suivants sur le disque, car le "
 "format %s n'est pas disponible pour eux:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Impossible de sauvegarder des livres électroniques"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
-msgstr ""
+msgstr "Récupération des News de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
-msgstr ""
+msgstr " récupéré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Aucun livre sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Impossible de visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Choisir le format à afficher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "Impossible d'ouvrir le répertoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
-msgstr ""
+msgstr "%s n'a pas de format disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossible de configurer pendant que des travaux sont en cours."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Copie la base"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Copie la librairie vers "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Base de données invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4799,24 +5218,24 @@ msgstr ""
 "<p>Une base de données invalide existe déjà ici : %s, spprimez la avant "
 "d'essayer de déplacer la base de données existante.<br>Erreur : %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Déplacement de la base de données impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Pas d'information détaillée disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Pas d'information détaillée disponible pour les livres dans l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4825,27 +5244,27 @@ msgstr ""
 "lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
 "électronique et redémarrer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Erreur lors de la conversion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
-msgstr ""
+msgstr "Emplacement de la librairie invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
-msgstr ""
+msgstr "Impossible d'accéder à %s. Utilise %s comme librairie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4854,28 +5273,33 @@ msgstr ""
 "Si vous le trouvez utile, pensez à donner afin de supporter son "
 "développement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 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/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 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 ""
+" communique avec l'appareil!<br>\n"
+"'Quitter peut créer une corruption dans l'appareil.<br>\n"
+"'Etes-vous sûr de vouloir quitter?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr "ATTENTION: Travaux actifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
+"continuera à tourner dans la zone de notification. Pour le fermer, choisir "
+"<b>Quitter</b> dans le menu contextuel de la zone de notification."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4883,7 +5307,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Dernière version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Mise à jour disponible"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4893,49 +5321,47 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">Nouveautés</a>. "
 "Visiter la page téléchargée ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Mise à jour disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr "Utiliser la librairie présente dans le répertoire spécifié."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
-msgstr ""
+msgstr "Démarrer en mode minimisé dans la zone de notification."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
-msgstr ""
+msgstr "Loggue les informations de débogage dans la console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "Sortie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
+"Indiquer le format de sortie utilisé lors de la conversion des ebooks et "
+"lors du téléchargement des News."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
-msgstr ""
+msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Recherche :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4943,7 +5369,7 @@ msgstr ""
 "Recherche les livres par titre ou auteur <br><br>Recherche en ET pour les "
 "mots séparés par des espaces."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4951,115 +5377,111 @@ msgstr ""
 "Recherche les livres par titre, auteur, éditeur, tags et commentaires "
 "<br><br>Recherche en ET pour les mots séparés par des espaces."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Réinitialisation de la recherche rapide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Aucune correspondance"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Toutes les correspondances"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Trier par &popularité"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Ajouter des livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Supprimer des livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Editer les méta-données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
-msgstr ""
+msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Récupérer des News"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
-msgstr ""
+msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Convertir des ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
-msgstr ""
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+msgid "Open containing folder"
+msgstr "Ouvre le répertoire contenant"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
-msgid "V"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
-msgid "Open containing folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Show book details"
 msgstr "Affiche les détails du livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Livres - même auteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Livres dans cette série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
-msgstr ""
+msgstr "Livres par cet éditeur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Livres avec les mêmes étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr "Envoyer le format spécifique vers l'appareil"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Préférences"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
-msgstr ""
+msgstr "Configurer calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
-msgstr ""
+msgstr "Ctrl+P"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:18
 msgid ""
@@ -5080,7 +5502,7 @@ msgstr "&Quitter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:84
 msgid "ERROR: Unhandled exception"
-msgstr "ERROR: Exception non traitée"
+msgstr "ERREUR: Exception non traitée"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
@@ -5092,21 +5514,23 @@ msgstr "Cliquer pour voir la liste des travaux actifs."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
 msgid "Click to browse books by their covers"
-msgstr ""
+msgstr "Cliquer pour naviguer dans les livres à l'aide des couvertures"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
 msgid "Click to turn off Cover Browsing"
-msgstr ""
+msgstr "Cliquer pour arrêter la navigation par couverture"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
+"<p>L'affichage des livres par leurs couvertures est désactivé. <br>L'import "
+"du module de flux d'image a échoué: <br>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:167
 msgid "Click to browse books by tags"
-msgstr ""
+msgstr "Cliquer pour naviguer dans les livres à l'aide des étiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Authors"
@@ -5144,6 +5568,8 @@ msgid ""
 "<p>Could not convert %d of %d books, because no suitable source format was "
 "found.<ul>%s</ul>"
 msgstr ""
+"<p>Impossible de convertir %d sur %d livres, car aucun format convenable de "
+"source n'a été trouvé.<ul>%s</ul>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:248
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:345
@@ -5153,7 +5579,7 @@ msgstr "Impossible de convertir certains livres"
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:387
 msgid "Fetch news from "
-msgstr ""
+msgstr "Récupérer des News de "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:384
 msgid "You must set a username and password for %s"
@@ -5161,7 +5587,7 @@ msgstr "Vous devez indiquer un utilisateur et un mot de passe pour %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:101
 msgid "Configure Ebook viewer"
-msgstr "Configuration de l'afficheur Ebook"
+msgstr "Configurer l'afficheur d'Ebook"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:102
 msgid "&Font options"
@@ -5177,7 +5603,7 @@ msgstr "Famille &Sans;"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:105
 msgid "&Monospace family:"
-msgstr ""
+msgstr "Famille &Monospace:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:106
 msgid "&Default font size:"
@@ -5248,86 +5674,88 @@ msgstr "La taille de fonte monospace en px"
 msgid "The standard font type"
 msgstr "Le type de fonte standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Aller vers..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Position dans le livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Inconnu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 "Aller vers une référence. Pour indiquer des numéros de référence, utiliser "
 "le mode référence."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Rechercher du texte dans le livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "Choisir un ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Ajouter un signet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Entrer un titre pour le signet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr "Pas de correspondance trouvée pour: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "Chargement du flux..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
-msgstr ""
+msgstr "Aménagement de %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "Charge l'ebook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Ce livre est protégé par <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "Erreur de DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "Impossible d'ouvrir l'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
-msgstr ""
+msgstr "Options pour contrôler l'afficheur d'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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 de s'afficher au premier "
+"plan au lancement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5381,15 +5809,15 @@ msgstr "Signet"
 msgid "Toggle full screen"
 msgstr "Passer en mode plein écran"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Expression régulière invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Expression régulière invalide: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5399,7 +5827,7 @@ msgstr ""
 "%d\n"
 "Livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
@@ -5409,7 +5837,7 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
@@ -5419,25 +5847,25 @@ msgstr ""
 "%s\n"
 "disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Cliquer pour voir la liste des livres présents sur votre ordinateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Cliquer pour voir la liste des livres présents dans la mémoire principale de "
 "votre lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
-"Cliquer pour voir la liste des livres présent dans la carte de stockage de "
+"Cliquer pour voir la liste des livres présents dans la carte mémoire de "
 "votre lecteur"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
 msgid "Settings to control the calibre content server"
-msgstr ""
+msgstr "Paramètres pour contrôler le serveur de contenu calibre"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
 msgid "The port on which to listen. Default is %default"
@@ -5445,7 +5873,7 @@ msgstr "Le port sur lequel écouter. Par défaut : %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:22
 msgid "The server timeout in seconds. Default is %default"
-msgstr ""
+msgstr "Timeout du serveur en secondes. Par défaut : %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
 msgid "The max number of worker threads to use. Default is %default"
@@ -5459,7 +5887,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:28
 msgid "Username for access. By default, it is: %default"
-msgstr ""
+msgstr "Nom d'utilisateur pour le contrôle d'accès. Par défaut: %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
 msgid "The maximum size for displayed covers. Default is %default."
@@ -5492,6 +5920,12 @@ msgid ""
 "Default: %%default. The special field \"all\" can be used to select all "
 "fields. Only has effect in the text output format."
 msgstr ""
+"Champs à afficher quand les livres sont listés dans la base. Doit être une "
+"liste de champs séparés par des virgules.\n"
+"Champs disponibles: %s\n"
+"Par défaut: %%default. Le champ spécial \"all\" peut être utilisé pour "
+"sélectionner tous les champs. Ceci n'affecte que le format du texte en "
+"sortie."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:197
 msgid ""
@@ -5499,6 +5933,9 @@ msgid ""
 "Available fields: %s\n"
 "Default: %%default"
 msgstr ""
+"Le champ utilisé pour trier les résultats.\n"
+"Champs disponibles: %s\n"
+"Par défaut: %%default"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:199
 msgid "Sort results in ascending order"
@@ -5510,12 +5947,17 @@ msgid ""
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
+"Filtrer les résultats à l'aide de la requête de recherche. Pour le format de "
+"la requête de recherche, veuillez consulter la section recherche dans le "
+"manuel utilisateur. Par défaut n'effectue aucun filtrage"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:203
 msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
 msgstr ""
+"Largeur maximum pour une seule ligne en sortie. Par défaut détecte la taille "
+"de l'écran."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:204
 msgid "The string used to separate fields. Default is a space."
@@ -5534,6 +5976,8 @@ msgid ""
 "The format in which to output the data. Available choices: %s. Defaults is "
 "text."
 msgstr ""
+"Format souhaité pour l'affichage des données. Choix disponibles: %s. Par "
+"défaut: texte."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:216
 msgid "Invalid fields. Available fields:"
@@ -5570,6 +6014,8 @@ 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 ""
+"Supposer que chaque répertoire dispose d'un livre logique et que tous les "
+"fichiers dans celui-ci sont des formats différents de ce même livre."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:331
 msgid "Process directories recursively"
@@ -5595,6 +6041,12 @@ msgid ""
 "separated list of id numbers (you can get id numbers by using the list "
 "command). For example, 23,34,57-85\n"
 msgstr ""
+"%prog remove ids\n"
+"\n"
+"Supprimer les livres identifiés par ids dans la base de données. ids doit "
+"être une liste d'identifiants séparés par des virgules (vous pouvez obtenir "
+"la liste des identifiants à l'aide de la commande list). Par exemple, "
+"23,34,57-85\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:368
 msgid "You must specify at least one book to remove"
@@ -5608,6 +6060,11 @@ msgid ""
 "identified by id. You can get id by using the list command. If the format "
 "already exists, it is replaced.\n"
 msgstr ""
+"%prog add_format [options] id fichier_livre\n"
+"\n"
+"Ajouter le livre dans fichier_livre aux formats disponibles pour le livre "
+"logique identifié par id. Vous pouvez obtenir l'identifiant à l'aide de la "
+"commande list. Si le format existe déjà, il sera remplacé.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:399
 msgid "You must specify an id and an ebook file"
@@ -5626,6 +6083,13 @@ msgid ""
 "by using the list command. fmt should be a file extension like LRF or TXT or "
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
+"\n"
+"%prog remove_format [options] id fmt\n"
+"\n"
+"Supprimer le format fmt du livre logique identifié par id. Vous pouvez "
+"obtenir l'identifiant à l'aide de la commande list. fmt doit être une "
+"extension de fichier comme LRF, TXT ou EPUB. Si le fichier logique n'a pas "
+"de format fmt disponible, n'effectue aucune action.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:425
 msgid "You must specify an id and a format"
@@ -5640,6 +6104,12 @@ msgid ""
 "id.\n"
 "id is an id number from the list command.\n"
 msgstr ""
+"\n"
+"%prog show_metadata [options] id\n"
+"\n"
+"Afficher les méta-données stockées dans la base de données calibre pour le "
+"livre identifié par id.\n"
+"id est un identifiant obtenu à l'aide de la commande list.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:451
 msgid "Print metadata in OPF form (XML)"
@@ -5661,6 +6131,16 @@ msgid ""
 "can get a quick feel for the OPF format by using the --as-opf switch to the\n"
 "show_metadata command.\n"
 msgstr ""
+"\n"
+"%prog set_metadata [options] id /repertoire/vers/meta-donnees.opf\n"
+"\n"
+"Indique les méta-données stockée dans la base calibre pour le livre "
+"identifié par id\n"
+"à partir du fichier OPF meta-donnees.opf. id est l'identifiant obtenu à "
+"partir de la commande list.\n"
+"Vous pouvez avoir un aperçu rapide du format OPF en utilisant --as-opf "
+"ajouté à la\n"
+"commande show_metadata.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:483
 msgid "You must specify an id and a metadata file"
@@ -5676,6 +6156,14 @@ msgid ""
 "(in\n"
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
+"%prog export [options] ids\n"
+"\n"
+"Exporter les livres spécifiés par ids (une liste séparée par des virgules) "
+"vers le système de fichiers.\n"
+"L'export sauvegarde tous les formats du livre, la couverture et les méta-"
+"données (dans\n"
+"un fichier opf). Vous pouvez obtenir les numéros id à partir de la commande "
+"list.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:503
 msgid "Export all books in database, ignoring the list of ids."
@@ -5775,7 +6263,7 @@ msgstr "Répertoire de la base dans laquelle les livres sont stockés"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:538
 msgid "Pattern to guess metadata from filenames"
-msgstr ""
+msgstr "gabarit de détection des metadata à partir des noms de fichiers."
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:540
 msgid "Access key for isbndb.com"
@@ -5827,6 +6315,10 @@ msgstr "Impossible d'activer une session SSH: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Impossible de s'authentifier auprès du server : %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5840,6 +6332,7 @@ msgstr "Article sans titre"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:15
 msgid "Options to control the fetching of periodical content from the web."
 msgstr ""
+"Options pour contrôler la récupération périodique de contenu à partir du web."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:18
 msgid "Customize the download engine"
@@ -5860,6 +6353,8 @@ msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
+"Intervalle minimal entre deux téléchargements, en secondes. %default s par "
+"défaut."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:470
@@ -5877,6 +6372,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 ""
+"Seuls les liens correspondant à cette expression régulière seront suivis. "
+"Cette option peut être spécifiée plusieurs fois, dans ce cas tout lien qui "
+"correspondra à quelque expression que ce soit, sera suivi. Par défaut, tous "
+"les liens sont suivis."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
@@ -5887,6 +6386,12 @@ msgid ""
 "filter-regexp and --match-regexp are specified, then --filter-regexp is "
 "applied first."
 msgstr ""
+"Tous les liens correspondant à cette expression régulière seront ignorés. "
+"Cette option peut être spécifiée plusieurs fois, dans chaque cas et aussi "
+"longtemps qu'il n'y aura aucun correspondance avec un lien, cela sera "
+"ignoré. Par défaut, aucun lien n'est ignoré. Si --filter-regexp et --match-"
+"regexp sont spécifiés ensemble, alors --filter-regexp sera appliqué en "
+"premier."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:476
@@ -5902,6 +6407,11 @@ msgid ""
 "If you specify this option, any argument to %prog is ignored and a default "
 "recipe is used to download the feeds."
 msgstr ""
+"Spécifier une liste de flux à télécharger. Par exemple:\n"
+"\"['http://feeds.newsweek.com/newsweek/TopNews', "
+"'http://feeds.newsweek.com/headlines/politics']\"\n"
+"Si vous spécifier cette option, tous les arguments de %prog sont ignorés et "
+"une recette par défaut est utilisée pour le téléchargement des flux."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:37
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:94
@@ -5914,6 +6424,8 @@ msgid ""
 "The title for this recipe. Used as the title for any ebooks created from the "
 "downloaded feeds."
 msgstr ""
+"Titre pour cette recette. Utilisé comme titre pour tous les livres créés à "
+"partir du téléchargement de flux."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:41
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:97
@@ -5932,7 +6444,7 @@ msgstr ""
 msgid ""
 "Number of levels of links to follow on webpages that are linked to from "
 "feeds. Defaul %default"
-msgstr ""
+msgstr "Niveau de profondeur du suivi des flux. %default par défaut."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:53
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:103
@@ -5958,6 +6470,8 @@ msgid ""
 "Useful for recipe development. Forces max_articles_per_feed to 2 and "
 "downloads at most 2 feeds."
 msgstr ""
+"Utile pour le développement d'une recette. Force max_articles_par_flux à 2 "
+"et télécharge au maximum 2 flux."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:63
 msgid ""
@@ -5979,11 +6493,33 @@ msgid ""
 "Available builtin recipes are:\n"
 "%s\n"
 msgstr ""
+"%%prog [options] ARG\n"
+"\n"
+"%%prog analyse une source d'articles en ligne, comme un flux RSS ou ATOM et "
+"récupère le contenu d'articles organisé sous forme d'une sympathique "
+"hiérarchie.\n"
+"\n"
+"ARG peut être un des éléments suivants:\n"
+"\n"
+"nom de fichier - %%prog essaiera de charger la recette à partir de ce "
+"fichier\n"
+"\n"
+"titre de recette intégrée - %%prog chargera la recette intégrée et "
+"l'utilisera pour récupérer le flux. Par ex. Newsweek , \"The BBC\" ou \"The "
+"New York Times\"\n"
+"\n"
+"recette sous forme de chaîne - %%prog chargera directement la recette à "
+"partir de l'argument chaine arg.\n"
+"\n"
+"Les recettes intégrées disponibles sont:\n"
+"%s\n"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:87
 msgid ""
 "Options to control web2disk (used to fetch websites linked from feeds)"
 msgstr ""
+"Options pour contrôler web2disk (utilisé pour récupérer les sites web liés à "
+"partir des flux)"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:105
 msgid "Dont show the progress bar"
@@ -5992,11 +6528,11 @@ msgstr "Ne pas afficher la barre de progression"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:120
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:684
 msgid "Fetching feeds..."
-msgstr ""
+msgstr "Récupération des flux..."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
-msgstr ""
+msgstr "Source de News inconnue"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:563
 msgid "Download finished"
@@ -6018,11 +6554,13 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:575
 msgid "\tFailed links:"
-msgstr ""
+msgstr "\tLiens qui ont échoués:"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:663
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
+"Impossible de récupérer l'article. Exécuter avec --debug pour en connaître "
+"la raison"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:688
 msgid "Got feeds from index page"
@@ -6076,34 +6614,41 @@ msgstr "Impossible de télécharger l'article: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
-msgstr ""
+msgstr "Récupération du flux"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "Italien"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Croate"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Serbe"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6151,7 +6696,7 @@ msgstr "Italien"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6203,27 +6748,35 @@ msgstr "Italien"
 msgid "English"
 msgstr "Anglais"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "Serbe"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Italien"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "Français"
 
@@ -6232,6 +6785,10 @@ msgstr "Français"
 msgid "Dutch"
 msgstr "Hollandais"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr "Bosniaque"
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6242,7 +6799,7 @@ msgstr "Portuguais"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6253,10 +6810,6 @@ msgstr "Allemand"
 msgid "Kovid Goyal"
 msgstr "Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "Croate"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "Italien"
@@ -6289,6 +6842,8 @@ msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
+"Nombre maximum de niveaux de récursivité c-à-d le niveau de profondeur de "
+"liens à suivre. Par défaut : %default"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:466
 msgid ""
@@ -6362,6 +6917,23 @@ msgstr "Affiche des informations détaillées. Utile pour le débogage"
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "&Priorité pour les travaux de conversion :"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Impossible de se connecter"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Vous devez spécifier une clef d'accès valide à isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Récupération des metadata pour <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Enregistrez-vous gratuitement sur <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> pour obtenir une clef d'accès "
+#~ "(access key)."
+
 #~ msgid "&Access Key;"
 #~ msgstr "&Access Key;"
 
@@ -6525,6 +7097,9 @@ msgstr "Affiche des informations détaillées. Utile pour le débogage"
 #~ msgid " does not allow copying of text."
 #~ msgstr " ne permet pas de copier du texte."
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Erreur lors de la recherche de métadonnées"
+
 #~ msgid ""
 #~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 #~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -6556,3 +7131,6 @@ msgstr "Affiche des informations détaillées. Utile pour le débogage"
 
 #~ msgid "author"
 #~ msgstr "auteur"
+
+#~ msgid "Send specific format to device"
+#~ msgstr "Envoyer le format spécifique vers l'appareil"
diff --git a/src/calibre/translations/gl.po b/src/calibre/translations/gl.po
index 3cfb7dcbe5..7e2dbc75e3 100644
--- a/src/calibre/translations/gl.po
+++ b/src/calibre/translations/gl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2008-09-30 12:33+0000\n"
 "Last-Translator: Calidonia <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -134,27 +141,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -218,17 +226,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "O lector non ten conectada tarxeta de almacenamento ningunha"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -475,7 +483,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -486,14 +494,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -512,88 +520,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -614,7 +622,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -629,7 +637,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -670,9 +678,9 @@ msgid "Sort key for the author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr ""
 
@@ -1398,63 +1406,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1570,7 +1578,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1586,11 +1594,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1757,97 +1765,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1884,7 +1896,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1892,43 +1904,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -1937,7 +2089,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2035,143 +2188,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2189,211 +2391,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2402,33 +2705,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2456,7 +2759,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2510,26 +2813,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2539,7 +2842,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2860,47 +3163,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3219,58 +3528,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3350,84 +3677,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3825,11 +4153,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3914,45 +4242,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3981,7 +4313,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4028,148 +4360,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4185,436 +4498,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4800,84 +5078,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4928,44 +5206,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5324,6 +5602,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5561,34 +5843,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5636,7 +5925,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5688,20 +5977,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5709,6 +6005,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5717,6 +6014,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5727,7 +6028,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5738,10 +6039,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/translations/he.po b/src/calibre/translations/he.po
index ba32c197e2..3a3ade88c2 100644
--- a/src/calibre/translations/he.po
+++ b/src/calibre/translations/he.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-03-02 20:50+0000\n"
 "Last-Translator: nikitajy <nikitajy@gmail.com>\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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "לא עושה דבר"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -136,27 +143,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -220,17 +228,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -472,7 +480,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -483,14 +491,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -509,88 +517,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -611,7 +619,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -626,7 +634,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -667,9 +675,9 @@ msgid "Sort key for the author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr ""
 
@@ -1395,63 +1403,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1567,7 +1575,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1583,11 +1591,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1754,97 +1762,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1881,7 +1893,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1889,43 +1901,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -1934,7 +2086,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2032,143 +2185,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2186,211 +2388,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2399,33 +2702,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2453,7 +2756,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2507,26 +2810,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2536,7 +2839,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2857,47 +3160,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3216,58 +3525,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3347,84 +3674,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3822,11 +4150,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3911,45 +4239,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3978,7 +4310,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4025,148 +4357,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4182,436 +4495,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4797,84 +5075,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4925,44 +5203,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5321,6 +5599,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5558,34 +5840,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5633,7 +5922,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5685,20 +5974,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5706,6 +6002,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5714,6 +6011,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5724,7 +6025,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5735,10 +6036,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/translations/hr.po b/src/calibre/translations/hr.po
index 938e1862c0..44f044f9c9 100644
--- a/src/calibre/translations/hr.po
+++ b/src/calibre/translations/hr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-03-19 23:57+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-27 00:17+0000\n"
 "Last-Translator: Miro Glavic <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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Uopće ne funkcionira"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,33 +144,34 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Čitaj metapodatke iz %s datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Izluči omot iz komičnih datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Čitaj metapodatke iz elektroničkih knjiga u ZIP arhivama"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Ćitaj metapodatke iz elektroničkih knjiga u RAR arhivama"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Postavi metapodatke u %s datotekama"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
 msgid "Installed plugins"
-msgstr "Intalirani priključci"
+msgstr "Instalirani priključci"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
 msgid "Mapping for filetype plugins"
@@ -230,17 +238,17 @@ msgstr "Onesposobi imenovani priključak"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Čitalac nema spojenu memorijsku karticu"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Memorijska kartica nema dovoljno slobodnog prostora"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Glavna memorija nema dovoljno slobodnog prostora"
 
@@ -385,6 +393,11 @@ msgid ""
 "trying\n"
 "to auto-generate a Table of Contents.\n"
 msgstr ""
+"Kontroliraj automatsko generiranje Sadržaja. Ako je neka OPF datoteka "
+"otkrivena\n"
+"i specificira Sadržaj, onda će to biti upotrijebljeno namjesto pokušaja da "
+"se\n"
+"Sadržaj auto-generira.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:171
 msgid ""
@@ -393,8 +406,8 @@ msgid ""
 "threshold number of chapters were detected."
 msgstr ""
 "Maksimalan broj veza za unošenje u TOC. Postavi na 0 da onesposobiš. "
-"Standardno je: %standardno. Veze se dodaju u TOC samo ako je otkriveno manje "
-"od --toc-threshold broja otkrivenih poglavlja."
+"Standardno je: %default. Veze se dodaju u TOC samo ako je otkriveno manje od "
+"--toc-threshold broja otkrivenih poglavlja."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:175
 msgid "Don't add auto-detected chapters to the Table of Contents."
@@ -406,7 +419,7 @@ msgid ""
 "the Table of Contents. Default: %default"
 msgstr ""
 "Ukoliko je otkriven manji broj poglavlja od ovog broja, onda se veze dodaju "
-"u Sadržaj. Standardno: %standardno."
+"u Sadržaj. Standardno: %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:180
 msgid ""
@@ -444,6 +457,10 @@ msgid ""
 "placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
 "an overview of the NCX format."
 msgstr ""
+"Put do a.ncx datoteke sadrži sadržaj za upotrebu u ovoj knjizi. NCX datoteka "
+"bi trebala imati veze sa direktorijem u koji je postavljena. Pogledaj "
+"http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX za pregled NCX "
+"formata."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:198
 msgid ""
@@ -460,25 +477,27 @@ msgstr "Izgled kontrolne stranice"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:204
 msgid "Set the top margin in pts. Default is %default"
-msgstr ""
+msgstr "Postavi gornju marginu u pts. Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:206
 msgid "Set the bottom margin in pts. Default is %default"
-msgstr ""
+msgstr "Postavi donju marginu u pts. Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:208
 msgid "Set the left margin in pts. Default is %default"
-msgstr ""
+msgstr "Postavi lijevu marginu u pts. Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:210
 msgid "Set the right margin in pts. Default is %default"
-msgstr ""
+msgstr "Postavi desnu marginu u pts. Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:212
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
+"Veličina osnovnog pisma u pts. Standardno je %default. Postavi na 0 da "
+"onesposobiš promjenu veličine pisama."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:215
 msgid ""
@@ -487,16 +506,22 @@ msgid ""
 "css. Spacing removal will not work if the source file forces inter-paragraph "
 "spacing."
 msgstr ""
+"Ukloni razmak između paragrafa. Također postavi uvučen redak za paragrafe na "
+"1.5em. Ovo možete nadvladati dodavajući p {text-indent: 0cm} u --override-"
+"css. Uklanjanje razmaka neće funkcionirati ako izvorna datoteka prisiljava "
+"razmak."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:221
 msgid "Do not force text to be justified in output."
-msgstr ""
+msgstr "Ne forsiraj tekst da bude poravnat u izlazu."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:223
 msgid ""
 "Remove table markup, converting it into paragraphs. This is useful if your "
 "source file uses a table to manage layout."
 msgstr ""
+"Ukloni obilježja tabela, pretvarajući je u paragraf. Ovo je korisno ako vaše "
+"izvorna datoteka upotrebljava tabele za formatiranje."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:226
 msgid ""
@@ -504,23 +529,27 @@ msgid ""
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
+"Očuvaj strukturu HTML tagova kod razbijanja velikih HTML datoteka. Ovo je "
+"neophodno samo ako HTML datoteke sadrže CSS koji upotrebljava slične "
+"odabirače. Osposobljavanje ove funkcije uvelike usporava procesuiranje "
+"velikih HTML datoteka."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:232
 msgid "Print generated OPF file to stdout"
-msgstr ""
+msgstr "Ispiši generiranu OPF datoteku u stdout"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:234
 msgid "Print generated NCX file to stdout"
-msgstr ""
+msgstr "Ispiši generiranu NCX datoteku u stdout"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:237
 msgid "Keep intermediate files during processing by html2epub"
-msgstr ""
+msgstr "Zadrži posredničke datoteke tijekom procesuiranja od html2epub"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:239
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
-msgstr ""
+msgstr "Izluči sadržaj proizvedene EPUB datoteke u specificirani direktorij."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:186
 msgid ""
@@ -529,12 +558,16 @@ msgid ""
 "Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
+"%%prog [opcije] imedatoteke\n"
+"\n"
+"Pretvori bilo koji od velikog broja formata elektroničkih knjiga u %s "
+"datoteku. Podržani formati su: %s\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:105
 msgid "Could not find an ebook inside the archive"
-msgstr ""
+msgstr "Nije pronađena elektronička knjiga u arhivi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -544,115 +577,135 @@ msgid ""
 "takes from\n"
 "the <spine> element of the OPF file.  \n"
 msgstr ""
+"%prog [opcije] datoteka.html|opf\n"
+"\n"
+"Pretvori HTML datoteku u EPUB elektroničku knjigu. Ovo rekurzivno prati veze "
+"u HTML datoteci.\n"
+"Ako specificirate OPF umjesto HTML datoteke, lista veza je uzeta sa <spine> "
+"elementa\n"
+"iz OPF datoteke.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
-msgstr ""
+msgstr "Izlaz zapisan u "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
-msgstr ""
+msgstr "Morate specificirati ulaznu HTML datoteku"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/iterator.py:36
 msgid "%s format books are not supported"
-msgstr ""
+msgstr "Knjige %s formata nisu podržane"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:30
 msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
+"Nije moguće pronaći odgovarajuće mjesto gdje odvojiti: %s Sub-tree veličina: "
+"%d Kb"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:142
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
+"\t\tPreviše oznaka. Ponovno dijeljenje bez očuvanja strukture. Ovo može "
+"uzrokovati nepravilno prikazivanje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
-msgstr ""
+msgstr "Zapisan procesuirani HTML u "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
-msgstr ""
+msgstr "Opcije za kontrolu popriječavanja HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
-msgstr ""
+msgstr "Izlazni direktorij. Standardan je aktivni direktorij."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
+"Kodiranje karaktera za HTML datoteke. Standardno je da su auto-otkriveni."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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 ""
+"Kreiraj izlaz u zip datoteci. ako je ova opcija specificirana, --output bi "
+"trebalo biti ime datoteke a ne direktorija."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
-msgstr ""
+msgstr "Kontrola praćenja veza u HTML datotekama."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
+"Popriječi veze u HTML datotekama prvo po širini. Normalno, ovi su "
+"popriječani prvo po dubini."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
+"Maksimalne razine suvrata kod praćenja veza u HTML datoekama. Moraju biti ne-"
+"negativne. 0 implicira da veze u izvornoj HTML datoteci nisu praćene."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
-msgstr ""
+msgstr "Postavi metapodatke generirane elektroničke knjige"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
-msgstr ""
+msgstr "Postavi naslov. Standardno je da se autootkrivaju."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
-msgstr ""
+msgstr "Autor(i) elektroničke knjige, kao & odvojena lista."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
-msgstr ""
+msgstr "Predmet(i) ove knjige, kao zarezom odvojena lista."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
-msgstr ""
+msgstr "Postavi izdavača ove knjige."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
-msgstr ""
+msgstr "Sažetak ove knjige."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
-msgstr ""
+msgstr "Učitaj metapodatke iz specificirane OPF datoteke."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
-msgstr ""
+msgstr "Opcije korisne za otkrivanje pogrešaka."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
+"Budi malo verbalniji tijekom procesuiranja. Ovo se može specificirati "
+"bezbroj puta da se poveća verbalnost."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
-msgstr ""
+msgstr "Izlazni HTML je \"lijepo ispisan\" za lakše analiziranje sintakse"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -663,19 +716,25 @@ msgid ""
 "element\n"
 "is used.\n"
 msgstr ""
+"%prog [opcije] datoteka.html|opf\n"
+"\n"
+"Prati sve veze u HTML datoteci i prikupi ih u specificirani direktorij.\n"
+"Također prikuplja ostala sredsta kaoslike, formatne liste, skripte itd. \n"
+"Ako je OPF datoteka specificirana, lista datoteka u <spine> elementu\n"
+"je upotrijebljena.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
-msgstr ""
+msgstr "Kreiranje LIT datoteke iz EPUB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:892
 msgid "%prog [options] LITFILE"
-msgstr ""
+msgstr "%prog [opcije] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
-msgstr ""
+msgstr "Izlazni direktorij. Podrazumijeva se kao aktivni direktorij."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:898
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
@@ -685,69 +744,74 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:731
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:578
 msgid "Useful for debugging."
-msgstr ""
+msgstr "Korisno za otkrivanje grešaka."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
-msgstr ""
+msgstr "OEB elektronička knjiga kreirana u"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:725
 msgid "%prog [options] OPFFILE"
-msgstr ""
+msgstr "%prog [opcije] OPFFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:728
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_feeds.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:575
 msgid "Output file. Default is derived from input filename."
-msgstr ""
+msgstr "Izlazna datoteka. Osnova je izvedena iz imena ulazne datoteke."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76
 msgid "Set the title. Default: filename."
-msgstr ""
+msgstr "Postavi naslov. Standardno: imedatoteke."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:78
 msgid ""
 "Set the author(s). Multiple authors should be set as a comma separated list. "
 "Default: %default"
 msgstr ""
+"Postavi autora(e). Više autora bi trebalo biti postavljeno kao zarezom "
+"odvojene liste. Standardno: %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 msgid "Set the comment."
-msgstr ""
+msgstr "Postavi komentar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
 msgid "Set the category"
-msgstr ""
+msgstr "Postavi kategoriju."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:85
 msgid "Sort key for the title"
-msgstr ""
+msgstr "Ključ sortiranja za naslov"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 msgid "Sort key for the author"
-msgstr ""
+msgstr "Ključ sortiranja za autora"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
-msgstr ""
+msgstr "Izdavač"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:91
 msgid "Path to file containing image to be used as cover"
-msgstr ""
+msgstr "Put do datoteke koja sadrži sliku koju će se upotrijebiti za omot"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:93
 msgid ""
 "If there is a cover graphic detected in the source file, use that instead of "
 "the specified cover."
 msgstr ""
+"Ako postoji grafička obrada omota u izvornoj datoteci, upotrijebi istu "
+"namjesto specificiranog omota."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:96
 msgid "Output file name. Default is derived from input filename"
 msgstr ""
+"Naziv izlazne datoteke. Zadano ime je izvedeno iz imena ulazne datoteke."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:550
@@ -755,6 +819,8 @@ msgid ""
 "Render HTML tables as blocks of text instead of actual tables. This is "
 "neccessary if the HTML contains very large or complex tables."
 msgstr ""
+"Prikaži HTML tabele kao blokove teksta namjesto aktualne tabele. Ovo je "
+"neophodno ako HTML sadrži vrlo velike ili kompleksne tabele."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:101
 msgid ""
@@ -762,38 +828,45 @@ msgid ""
 "option obsoletes the --font-delta option and takes precedence over it. To "
 "use --font-delta, set this to 0. Default: %defaultpt"
 msgstr ""
+"Specificiraj veličinu osnovnog pisma u pts. Sva pisma će biti jednako "
+"promijenjena. Ova opcija negira --font-delta opciju i preuzima prvenstvo. Da "
+"bi upotrijebili --font-delta, postavite ga na 0. Standardno: %defaultpt"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:103
 msgid "Enable autorotation of images that are wider than the screen width."
-msgstr ""
+msgstr "Omogući autorotaciju slika koje su šire od širine zaslona."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:106
 msgid "Set the space between words in pts. Default is %default"
-msgstr ""
+msgstr "Postavi razmak između riječi u pts. Standardno je %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:108
 msgid "Separate paragraphs by blank lines."
-msgstr ""
+msgstr "Odvoji paragrafe čistim linijama."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:110
 msgid "Add a header to all the pages with title and author."
-msgstr ""
+msgstr "Dodaj zaglavlje na sve stranice sa naslovom i autorom."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:112
 msgid ""
 "Set the format of the header. %a is replaced by the author and %t by the "
 "title. Default is %default"
 msgstr ""
+"Postavi format zaglavlja. %a je zamijenjeno autorom a %t naslovom. "
+"Standardno je %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:114
 msgid "Add extra spacing below the header. Default is %default px."
-msgstr ""
+msgstr "Dodaj više razmaka ispod zaglavlja. Standardno je %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:116
 msgid ""
 "Override the CSS. Can be either a path to a CSS stylesheet or a string. If "
 "it is a string it is interpreted as CSS."
 msgstr ""
+"Nadvladaj CSS. Ovo može biti ili put do CSS formatnih lista ili string. "
+"String je protumačen kao CSS."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:118
 msgid ""
@@ -801,12 +874,17 @@ msgid ""
 "the HTML files are appended to the LRF. The .opf file must be in the same "
 "directory as the base HTML file."
 msgstr ""
+"Upotrijebi <spine> element iz OPF datoteke za odrediti redoslijed dodavanja "
+"HTML datoteka u LRF. .opf datoteka mora biti u istom direktoriju kao i "
+"osnovna HTML datoteka."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:120
 msgid ""
 "Minimum paragraph indent (the indent of the first line of a paragraph) in "
 "pts. Default: %default"
 msgstr ""
+"Minimalna uvlaka paragrafa (uvučenost prvog reda paragrafa) u pts. "
+"Standardno: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:122
 msgid ""
@@ -814,12 +892,17 @@ msgid ""
 "FONT_DELTA pts. FONT_DELTA can be a fraction.If FONT_DELTA is negative, the "
 "font size is decreased."
 msgstr ""
+"Povećaj veličinu pisma za 2 *FONT_DELTA pts i razmak između redova za "
+"FONT_DELTA pts. FONT_DELTA može biti i razlomak. Ako je FONT_DELTA "
+"negativan, veličina pisma se smanjuje."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:127
 msgid ""
 "Render all content as black on white instead of the colors specified by the "
 "HTML or CSS."
 msgstr ""
+"Prikaži cijeli sadržaj kao crno na bijelom namjesto u bojama specificiranim "
+"od HTML ili CSS."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:133
 msgid ""
@@ -827,34 +910,41 @@ msgid ""
 "profile determines things like the resolution and screen size of the target "
 "device. Default: %s Supported profiles: "
 msgstr ""
+"Profil odredišnog uređaja za kojeg se ovaj LRF generira. Profil određuje "
+"stvari kao razlučivost i veličinu zaslona odredišnog uređaja. Standardno: "
+"%s. Podržani profili: "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:139
 msgid "Left margin of page. Default is %default px."
-msgstr ""
+msgstr "Lijeva margina stranice. Standardno je %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:141
 msgid "Right margin of page. Default is %default px."
-msgstr ""
+msgstr "Desna margina stranice. Standardno je %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:143
 msgid "Top margin of page. Default is %default px."
-msgstr ""
+msgstr "Gornja margina stranice. Standardno je %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:145
 msgid "Bottom margin of page. Default is %default px."
-msgstr ""
+msgstr "Donja margina stranice. Standardno je %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:147
 msgid ""
 "Render tables in the HTML as images (useful if the document has large or "
 "complex tables)"
 msgstr ""
+"Prikaži tabele u HTML kao slike (korisno ako dokument ima velike ili "
+"kompleksne tabele)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:149
 msgid ""
 "Multiply the size of text in rendered tables by this factor. Default is "
 "%default"
 msgstr ""
+"Umnoži veličinu teksta u predstavljenim tabelama sa ovim faktorom. "
+"Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:154
 msgid ""
@@ -862,26 +952,32 @@ msgid ""
 "means thats links are not followed. A negative value means that <a> tags are "
 "ignored."
 msgstr ""
+"Maksimalan broj razina za suvratno procesuiranje veza. Vrijednost 0 znači da "
+"veze nisu praćene. Negativna vrijednost znači  da su <a> tagovi ignorirani."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:158
 msgid ""
 "A regular expression. <a> tags whose href matches will be ignored. Defaults "
 "to %default"
 msgstr ""
+"Regularni izraz. <a> tagovi čiji href odgovara će biti ignorirani. "
+"Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:162
 msgid "Don't add links to the table of contents."
-msgstr ""
+msgstr "Nemoj dodavati veze na sadržaj."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:166
 msgid "Prevent the automatic detection chapters."
-msgstr ""
+msgstr "Spriječi automatsko otkrivanje poglavlja."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:169
 msgid ""
 "The regular expression used to detect chapter titles. It is searched for in "
 "heading tags (h1-h6). Defaults to %default"
 msgstr ""
+"Regularni izraz upotrijebljen za otkrivanje naslova poglavlja. Pretražuje se "
+"u tagovima zaglavlja (h1-h6). Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:172
 msgid ""
@@ -908,6 +1004,8 @@ msgstr ""
 msgid ""
 "Force a page break before tags whose names match this regular expression."
 msgstr ""
+"Prisili kraj stranice prije tagova čija imena odgovaraju ovom regularnom "
+"izrazu."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:186
 msgid ""
@@ -916,24 +1014,31 @@ msgid ""
 "regexp. For example to match all heading tags that have the attribute "
 "class=\"chapter\" you would use \"h\\d,class,chapter\". Default is %default"
 msgstr ""
+"Prisili kraj stranice prije elementa koji ima specificirani atribut. Format "
+"ove opcije je tagname regexp.attribut name,attribute value regexp. Na "
+"primjer: za spariti sve tagove zaglavlja koji imaju atribut "
+"class=\"chapter\" upotrijebite \"h\\d,class,chapter\". Standardno je "
+"%default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:189
 msgid "Add detected chapters to the table of contents."
-msgstr ""
+msgstr "Dodaj otkrivena poglavlja u sadržaj."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:192
 msgid "Preprocess Baen HTML files to improve generated LRF."
-msgstr ""
+msgstr "Preobradi Baen HTML datoteke za poboljšanje generirane LRF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:194
 msgid ""
 "You must add this option if processing files generated by pdftohtml, "
 "otherwise conversion will fail."
 msgstr ""
+"Morate dodati ovu opciju ako su procesne datoteke generirane od pdftohtml, u "
+"protivnom pretvorba neće uspjeti."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:196
 msgid "Use this option on html0 files from Book Designer."
-msgstr ""
+msgstr "Upotrijebi ovu opciju na html0 datotekama iz Book Designer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:199
 msgid ""
@@ -942,32 +1047,39 @@ msgid ""
 "slower page turns. For example: --serif-family \"Times New Roman\"\n"
 "    "
 msgstr ""
+"Specificirtrutype familije pisama za serif, sans-serif i monospace pisma. "
+"Ova pisma će biti pridružena LRF datoteci. Imajte na umu da posebno "
+"prilagođena pisma dovode do sporijeg listanja stranica. Na primjer: --serif-"
+"family \"Times New Roman\"\n"
+"    "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:207
 msgid "The serif family of fonts to embed"
-msgstr ""
+msgstr "Serif familija pisama za pridružiti"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:210
 msgid "The sans-serif family of fonts to embed"
-msgstr ""
+msgstr "Sans-serif familija pisama za pridružiti"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:213
 msgid "The monospace family of fonts to embed"
-msgstr ""
+msgstr "Monospace familija pisama za pridružiti"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:217
 msgid "Be verbose while processing"
-msgstr ""
+msgstr "Budi govorljiv kod procesiranja"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:219
 msgid "Convert to LRS"
-msgstr ""
+msgstr "Pretvori u LRS"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:221
 msgid ""
 "Minimize memory usage at the cost of longer processing times. Use this "
 "option if you are on a memory constrained machine."
 msgstr ""
+"Smanji korištenje memorije na račun dužeg vremena procesiranja. Upotrijebi "
+"ovu opciju ako radite sa neadekvatnom memorijom."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:223
 msgid ""
@@ -979,7 +1091,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
-msgstr ""
+msgstr "Pretvaranje sa %s na LRF nije podržano."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
@@ -991,18 +1103,25 @@ msgid ""
 "ZIP archive, looking for an ebook inside the archive.\n"
 "    "
 msgstr ""
+"any2lrf [opcije] myfile\n"
+"\n"
+"Pretvori bilo koji format elektroničke knjige u LRF. Podržani formati su:\n"
+"LIT, RTF, TXT, HTML, EPUB, MOBI, PRC i PDF. any2lrf će također procesirati "
+"RAR ili\n"
+"ZIP arhive, tražeći elektroničku knjigu unutar arhive.\n"
+"    "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
-msgstr ""
+msgstr "Nije specificirana datoteka za pretvaranje."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:225
 msgid "Rendered %s"
-msgstr ""
+msgstr "Podnešeno %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:228
 msgid "Failed %s"
-msgstr ""
+msgstr "Neuspjelo %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
 msgid ""
@@ -1010,65 +1129,84 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Neuspjelo procesiranje stripa: %s\n"
+"\n"
+"%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:287
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
+"Opcije za kontrolu pretvaranja strip (CBR< CBZ) datoteka u elektroničke "
+"knjige."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
+"Naslov generirane elektroničke knjige. Normalno je upotrijebiti filename."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
+"Postavi autora u metapodacima generirane elektroničke knjige. Standardno je "
+"%default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:22
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
+"Put do izlazne datoteke. Uobičajeno je da se datoteka uradi u aktivnom "
+"direktoriju."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Number of colors for grayscale image conversion. Default: %default"
-msgstr ""
+msgstr "Broj boja za grayscale pretvorbu slike. Standardno: %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
+"Onesposobi normaliziranje (poboljšanje kontrasta) opsega boja za slike. "
+"Standardno: Pogrešno"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
-msgstr ""
+msgstr "Održi proporcije slike. Standardno je da se popuni zaslon."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid "Disable sharpening."
-msgstr ""
+msgstr "Onesposobi izoštravanje."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Disable trimming of comic pages. For some comics, trimming might remove "
 "content as well as borders."
 msgstr ""
+"Onesposobi podrezivanje stranica stripova. Kod nekih stripova podrezivanje "
+"može izbrisati i sadržaj i obrub."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
 msgid "Don't split landscape images into two portrait images"
-msgstr ""
+msgstr "Ne cijepaj pejsažne slike u dvije portretne slike."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
+"Održi proporcije i promijeni veličinu slike koristeći visinu zaslona kao "
+"širinu slike za pregledavanje u pejsažnom modu."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
+"Upotrijebljava se za s desna na lijevo publikacije kao što je manga. "
+"Uzrokuje cijepanje pejsažnih stranica u portretne stranice sa desna na "
+"lijevo."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:317
 msgid ""
@@ -1081,6 +1219,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 ""
+"Ne sortiraj datoteke pronađene u stripu abecedno po imenu. Upotrijebi "
+"redoslijed kojim su dodavane u strip."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:321
 msgid ""
@@ -1088,6 +1228,9 @@ msgid ""
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
+"Odaberite profil uređaja za kojeg generirate ovu datoteku. Standardan je "
+"SONY PRS_500 sa zaslonom veličine 584x754 piksela. Ovo odgovara svakom "
+"čitaču sa istom veličinom zaslona. Izbori su %s."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:20
@@ -1095,14 +1238,16 @@ msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
+"Budi opširan, korisno kod otklanjanja grešaka. Možete specificirati mnoštvo "
+"puta za povećanje verbalnosti."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:325
 msgid "Don't show progress bar."
-msgstr ""
+msgstr "Ne prikazuj traku progresa."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:328
 msgid "Apply no processing to the image"
-msgstr ""
+msgstr "Ne primijenjuj procesiranje slike."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:333
 msgid ""
@@ -1110,15 +1255,18 @@ msgid ""
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
+"%prog [opcije] comic.cb[z|r]\n"
+"\n"
+"Pretvori strip u CBZ ili CBR datoteku u elektroničku knjigu. \n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:393
 msgid "Output written to"
-msgstr ""
+msgstr "Izlaz zapisan u"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:553
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_comic.py:35
 msgid "Rendering comic pages..."
-msgstr ""
+msgstr "Prikazivanje stranica stripa..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/epub/convert_from.py:17
 msgid ""
@@ -1127,6 +1275,10 @@ msgid ""
 "        \n"
 "%prog converts mybook.epub to mybook.lrf"
 msgstr ""
+"Usage: %prog [options] mybook.epub\n"
+"        \n"
+"        \n"
+"%prog pretvara mybook.epub u mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:23
 msgid ""
@@ -1135,115 +1287,127 @@ msgid ""
 "\n"
 "%prog converts mybook.fb2 to mybook.lrf"
 msgstr ""
+"%prog [options] mybook.fb2\n"
+"\n"
+"\n"
+"%prog pretvara mybook.fb2 u mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:24
 msgid "Print generated HTML to stdout and quit."
-msgstr ""
+msgstr "Ispiši generirani HTML u stdout u prekini."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:30
 msgid "Keep generated HTML files after completing conversion to LRF."
-msgstr ""
+msgstr "Zadrži generirane HTML datoteke nakon završetka pretvaranja u LRF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:20
 msgid "Options to control the behavior of feeds2disk"
-msgstr ""
+msgstr "Opcije za kontrolu ponašanja feeds2disk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:22
 msgid "Options to control the behavior of html2lrf"
-msgstr ""
+msgstr "Opcije za kontrolu ponašanja html2lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:44
 msgid "Fetching of recipe failed: "
-msgstr ""
+msgstr "Neuspjelo hvatanje recepta: "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:321
 msgid "\tBook Designer file detected."
-msgstr ""
+msgstr "\tBook Designer datoteka otkrivena."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:323
 msgid "\tParsing HTML..."
-msgstr ""
+msgstr "\tAnaliza HTML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:346
 msgid "\tBaen file detected. Re-parsing..."
-msgstr ""
+msgstr "\tBaen datoteka otkrivena. Ponovna analiza..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:362
 msgid "Written preprocessed HTML to "
-msgstr ""
+msgstr "Zapisan preprocesiran HTML u "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:380
 msgid "Processing %s"
-msgstr ""
+msgstr "Procesiranje %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:394
 msgid "\tConverting to BBeB..."
-msgstr ""
+msgstr "\tPretvaranje u BBeB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:540
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:553
 msgid "Could not parse file: %s"
-msgstr ""
+msgstr "Nemoguće analizirati datoteku: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
 msgid "%s is an empty file"
-msgstr ""
+msgstr "%s datoteka je prazna"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:565
 msgid "Failed to parse link %s %s"
-msgstr ""
+msgstr "Neuspjela analiza veze %s %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:609
 msgid "Cannot add link %s to TOC"
-msgstr ""
+msgstr "Nemoguće dodati vezu %s na TOC"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
-msgstr ""
+msgstr "Nemoguće procesirati sliku %s. Greška: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1003
 msgid "Unable to process interlaced PNG %s"
-msgstr ""
+msgstr "Nemoguće procesirati isprepletani PNG %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1018
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
+"Nemoguće procesirati sliku: %s\n"
+"%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
+"Dogodila se greška tijekom procesiranja tabele: %s. Ignoriram postavke "
+"tabele."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
+"Loša tabela:\n"
+"%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796
 msgid "Table has cell that is too large"
-msgstr ""
+msgstr "Tabela sadrži ćeliju koja je prevelika"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1826
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
+"Prvo morate zaštititi web stranicu %s kao html datoteku, a potom izvesti "
+"html2lrf na istoj."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1869
 msgid "Could not read cover image: %s"
-msgstr ""
+msgstr "Nemoguće pročitati naslovnu sliku: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1872
 msgid "Cannot read from: %s"
-msgstr ""
+msgstr "Nemoguće čitati iz: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1997
 msgid "Failed to process opf file"
-msgstr ""
+msgstr "Nespjelo procesiranje opf datoteke"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid ""
@@ -1255,6 +1419,13 @@ msgid ""
 "to local files recursively. Thus, you can use it to \n"
 "convert a whole tree of HTML files."
 msgstr ""
+"Korištenje: %prog [options] mybook.html\n"
+"\n"
+"\n"
+"%prog pretvara mybook.html to mybook.lrf. \n"
+"%prog slijedi sve veze u mybook.html koje vode \n"
+"ka lokalnim datotekama, suvratno. Dakle, možete \n"
+"ga koristiti za pretvaranje cijelog stabla HTML datoteka."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lit/convert_from.py:15
 msgid ""
@@ -1263,59 +1434,67 @@ msgid ""
 "\n"
 "%prog converts mybook.lit to mybook.lrf"
 msgstr ""
+"Korištenje: %prog [options] mybook.lit\n"
+"\n"
+"\n"
+"%prog pretvara mybook.lit u mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
 msgid ""
 "%prog book.lrf\n"
 "Convert an LRF file into an LRS (XML UTF-8 encoded) file"
 msgstr ""
+"%prog book.lrf\n"
+"Pretvori LRF datoteku u LRS (XML UTF-8 kodiranu) datoteku"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
-msgstr ""
+msgstr "Izlazna LRS datoteka"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
 msgid "Do not save embedded image and font files to disk"
-msgstr ""
+msgstr "Ne pohranjuj ugrađenu sliku i datoteke pisama na disk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
-msgstr ""
+msgstr "Analiza LRF..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
-msgstr ""
+msgstr "Kreiranje XML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
-msgstr ""
+msgstr "LRS zapisan u "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:266
 msgid "Could not read from thumbnail file:"
-msgstr ""
+msgstr "Nemoguće pročitati sa datoteke sličice:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:286
 msgid ""
 "%prog [options] file.lrs\n"
 "Compile an LRS file into an LRF file."
 msgstr ""
+"%prog [options] file.lrs\n"
+"Prikupi LRS datoteku u LRF datoteku."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:287
 msgid "Path to output file"
-msgstr ""
+msgstr "Put do izlazne datoteke"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:289
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:116
 msgid "Verbose processing"
-msgstr ""
+msgstr "Verbalno procesiranje"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:291
 msgid "Convert LRS to LRS, useful for debugging."
-msgstr ""
+msgstr "Pretvori LRS u LRS, korisno za uklanjanje grešaka."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:455
 msgid "Invalid LRF file. Could not set metadata."
-msgstr ""
+msgstr "Nevažeć LRF datoteka. Nemoguće postaviti metapodatke."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:580
 msgid ""
@@ -1325,68 +1504,75 @@ msgid ""
 "Show/edit the metadata in an LRF file.\n"
 "\n"
 msgstr ""
+"%prog [options] mybook.lrf\n"
+"\n"
+"\n"
+"Izloži/uredi metapodatke u LRF datoteci.\n"
+"\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:587
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:43
 msgid "Set the book title"
-msgstr ""
+msgstr "Postavi naslov knjige"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
 msgid "Set sort key for the title"
-msgstr ""
+msgstr "Postavi ključ svrstavanja naslova"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
 msgid "Set the author"
-msgstr ""
+msgstr "Postavi autora"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
 msgid "Set sort key for the author"
-msgstr ""
+msgstr "Postavi ključ svrstavanja autora"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:47
 msgid "The category this book belongs to. E.g.: History"
-msgstr ""
+msgstr "Kategorija kojoj ova knjiga pripada. Npr.: Povijest"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:598
 msgid "Path to a graphic that will be set as this files' thumbnail"
-msgstr ""
+msgstr "Put do grafike koja će postavljena kao sličica ove datoteke"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:601
 msgid ""
 "Path to a txt file containing the comment to be stored in the lrf file."
-msgstr ""
+msgstr "Put do txt datoteke koja sadrži komentar za pohranu u LRF datoteci."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:605
 msgid "Extract thumbnail from LRF file"
-msgstr ""
+msgstr "Izluči sličicu iz LRF datoteke"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:606
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:191
 msgid "Set the publisher"
-msgstr ""
+msgstr "Postavi izdavača"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
 msgid "Set the book classification"
-msgstr ""
+msgstr "Postavi klasifikaciju knjige"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
 msgid "Set the book creator"
-msgstr ""
+msgstr "Postavi kreatora knjige"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
 msgid "Set the book producer"
-msgstr ""
+msgstr "Postavi proizvođača knjige"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
 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 ""
+"Izluči omot iz LRF datoteke. Imajte na umu da LRF format nema definiran "
+"omot, te ćemo upotrijebiti heuristiku da pogodimo omot."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613
 msgid "Set book ID"
-msgstr ""
+msgstr "Postavi ID knjige"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/mobi/convert_from.py:43
 msgid ""
@@ -1395,15 +1581,20 @@ msgid ""
 "\n"
 "%prog converts mybook.mobi to mybook.lrf"
 msgstr ""
+"Korištenje: %prog [options] mybook.mobi|prc\n"
+"\n"
+"\n"
+"%prog pretvara mybook.mobi u mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:48
 msgid "Could not find pdftohtml, check it is in your PATH"
-msgstr ""
+msgstr "Nemoguće pronaći pdftohtml, provjeri da je vašem PUTU"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:74
 msgid ""
 " is an image based PDF. Only conversion of text based PDFs is supported."
 msgstr ""
+" je PDF baziran na slici. Podržana je samo pretvorba PDF na bazi teksta."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:93
 msgid ""
@@ -1412,20 +1603,26 @@ msgid ""
 "\n"
 "%prog converts mybook.pdf to mybook.lrf"
 msgstr ""
+"%prog [options] mybook.pdf\n"
+"\n"
+"\n"
+"%prog pretvara mybook.pdf u mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:403
 msgid ""
 "Path to output directory in which to create the HTML file. Defaults to "
 "current directory."
 msgstr ""
+"Put do izlaznog direktorija u kojem ćete kreirati HTML datoteku. "
+"Podrazumijeva se aktivni direktorij."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:405
 msgid "Be more verbose."
-msgstr ""
+msgstr "Budite više verbalni."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:417
 msgid "You must specify a single PDF file."
-msgstr ""
+msgstr "Morate specificirati jedinstvenu PDF datoteku."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:21
 msgid ""
@@ -1434,12 +1631,18 @@ msgid ""
 "\n"
 "%prog converts mybook.rtf to mybook.lrf"
 msgstr ""
+"%prog [options] mybook.rtf\n"
+"\n"
+"\n"
+"%prog pretvara mybook.rtf u mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:146
 msgid ""
 "This RTF file has a feature calibre does not support. Convert it to HTML and "
 "then convert it."
 msgstr ""
+"Ova RTF datoteka ima element koji caliber ne podržava. Pretvori ga u HTML i "
+"onda ga pretvori."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:19
 msgid ""
@@ -1448,102 +1651,106 @@ msgid ""
 "\n"
 "%prog converts mybook.txt to mybook.lrf"
 msgstr ""
+"%prog [options] mybook.txt\n"
+"\n"
+"\n"
+"%prog pretvara mybook.txt u mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:45
 msgid "Set the authors"
-msgstr ""
+msgstr "Postavi autore"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:49
 msgid "Set the comment"
-msgstr ""
+msgstr "Postavi komentar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
-msgid "Title"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+msgid "Title"
+msgstr "Naslov"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
-msgstr ""
+msgstr "Autor(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
-msgstr ""
+msgstr "Proizvođač"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
-msgstr ""
+msgstr "Komentari"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
-msgstr ""
+msgstr "Tagovi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
-msgstr ""
+msgstr "Serije"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
-msgstr ""
+msgstr "Jezik"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
-msgstr ""
+msgstr "Vremenska oznaka"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
 msgid "A comma separated list of tags to set"
-msgstr ""
+msgstr "Zarezom odvojene liste tagova za postavljanje"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:204
 msgid "The series to which this book belongs"
-msgstr ""
+msgstr "Serija kojoj ova knjiga pripada"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:206
 msgid "The series index"
-msgstr ""
+msgstr "Indeks serija"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:208
 msgid "The book language"
-msgstr ""
+msgstr "Jezik knjige"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:210
 msgid "Extract the cover"
-msgstr ""
+msgstr "Izluči omot"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54
 msgid "Usage:"
-msgstr ""
+msgstr "Korištenje:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:53
 msgid "Usage: imp-meta file.imp"
-msgstr ""
+msgstr "Korištenje: imp-meta file.imp"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:54
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:59
@@ -1567,38 +1774,40 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108
 msgid "The ISBN ID of the book you want metadata for."
-msgstr ""
+msgstr "ISBN ID knjige za koju tražite metapodatke."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
 msgid "The author whose book to search for."
-msgstr ""
+msgstr "Autor knjige koju tražite."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
 msgid "The title of the book to search for."
-msgstr ""
+msgstr "Naslov knjige koju tražite."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114
 msgid "The publisher of the book to search for."
-msgstr ""
+msgstr "Izdavač knjige koju tražite."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:46
 msgid "LibraryThing.com timed out. Try again later."
-msgstr ""
+msgstr "LibraryThing.com isteklo vrijeme. Probajte ponovo kasnije."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid ""
 "Could not fetch cover as server is experiencing high load. Please try again "
 "later."
 msgstr ""
+"Nemoguće dograbiti omot pošto je poslužitelj preopterećen. Molimo probajte "
+"ponovo kasnije."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:54
 msgid " not found."
-msgstr ""
+msgstr " nije pronađen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:57
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:88
 msgid "LibraryThing.com server error. Try again later."
-msgstr ""
+msgstr "Greška poslužitelja LibraryThing.com. Probajte ponovo kasnije."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:66
 msgid ""
@@ -1607,69 +1816,75 @@ msgid ""
 "\n"
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
+"\n"
+"%prog [options] ISBN\n"
+"\n"
+"Dograbi sliku omota za knjigu identificiranu od ISBN sa LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:43
 msgid "Usage: %s file.lit"
-msgstr ""
+msgstr "Korištenje: %s file.lit"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:236
 msgid "Cover saved to"
-msgstr ""
+msgstr "Omot pohranjen u"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:187
 msgid "Set the subject tags"
-msgstr ""
+msgstr "Postavi tagove teme"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:189
 msgid "Set the language"
-msgstr ""
+msgstr "Postavi jezik"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:193
 msgid "Set the ISBN"
-msgstr ""
+msgstr "Postavi ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
-msgstr ""
+msgstr "Postavi dc:language polje"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:58
 msgid "Usage: pdf-meta file.pdf"
-msgstr ""
+msgstr "Korištenje: pdf-meta file.pdf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:59
 msgid "Usage: rb-meta file.rb"
-msgstr ""
+msgstr "Korištenje: rb-meta file.rb"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_any.py:55
 msgid "Creating Mobipocket file from EPUB..."
-msgstr ""
+msgstr "Kreiranje Mobipocket datoteke iz EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
-msgstr ""
+msgstr "%prog [options] myebook.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
-msgstr ""
+msgstr "Sirov MOBI HTML pohranjen u"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:534
 msgid "Options to control the conversion to MOBI"
-msgstr ""
+msgstr "Opcije za kontrolu pretvorbe u MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:541
 msgid "Mobipocket-specific options."
-msgstr ""
+msgstr "Mobipocket-specifične opcije.."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:543
 msgid ""
 "Compress file text using PalmDOC compression. Results in smaller files, but "
 "takes a long time to run."
 msgstr ""
+"Sažmi tekst datoteke koristeći PalmDOC kompresiju. Rezultira u manjim "
+"datotekama, ali uzima puno vremena."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:546
 msgid "Modify images to meet Palm device size limitations."
-msgstr ""
+msgstr "Modificiraj slike da udovolje ograničenjima veličine Palm uređaja."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:548
 msgid "Title for any generated in-line table of contents."
@@ -1697,50 +1912,50 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:572
 msgid "[options]"
-msgstr ""
+msgstr "[opcije]"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:590
 msgid "Unknown source profile %r"
-msgstr ""
+msgstr "Nepoznati profil izvora %r"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:594
 msgid "Unknown destination profile %r"
-msgstr ""
+msgstr "Nepoznati profil odredišta %r"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:57
 msgid "The output directory. Defaults to the current directory."
-msgstr ""
+msgstr "Izlazni direktorij. Podrazumijeva se kao aktivni direktorij."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:822
 msgid "Cover"
-msgstr ""
+msgstr "Omot"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:823
 msgid "Title Page"
-msgstr ""
+msgstr "Naslovna Stranica"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:824
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
-msgstr ""
+msgstr "Sadržaj"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:825
 msgid "Index"
-msgstr ""
+msgstr "IndeksB"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:826
 msgid "Glossary"
-msgstr ""
+msgstr "Pojmovnik"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:827
 msgid "Acknowledgements"
-msgstr ""
+msgstr "Zahvale"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:828
 msgid "Bibliography"
-msgstr ""
+msgstr "Bibliografija"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:829
 msgid "Colophon"
@@ -1748,59 +1963,59 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:830
 msgid "Copyright"
-msgstr ""
+msgstr "Autorsko pravo"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:831
 msgid "Dedication"
-msgstr ""
+msgstr "Posveta"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:832
 msgid "Epigraph"
-msgstr ""
+msgstr "Epigraf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:833
 msgid "Foreword"
-msgstr ""
+msgstr "Predgovor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:834
 msgid "List of Illustrations"
-msgstr ""
+msgstr "Popis Ilustracija"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:835
 msgid "List of Tables"
-msgstr ""
+msgstr "Popis Tabela"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:836
 msgid "Notes"
-msgstr ""
+msgstr "Zabilješke"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:837
 msgid "Preface"
-msgstr ""
+msgstr "Uvod"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:838
 msgid "Main Text"
-msgstr ""
+msgstr "Glavni Tekst"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:13
 msgid "Options to control the transformation of pdf"
-msgstr ""
+msgstr "Opcije za kontrolu pretvorbe pdf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:24
 msgid "Number of pixels to crop from the left most x (default is %d) "
-msgstr ""
+msgstr "Broj piksela za podrezati od krajnjeg lijevog x (zadano je %d) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:26
 msgid "Number of pixels to crop from the left most y (default is %d) "
-msgstr ""
+msgstr "Broj piksela za podrezati od krajnjeg lijevog y (zadano je %d) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:28
 msgid "Number of pixels to crop from the right most x (default is %d) "
-msgstr ""
+msgstr "Broj piksela za podrezati od krajnjeg desnog x (zadano je %d) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:30
 msgid "Number of pixels to crop from the right most y (default is %d)"
-msgstr ""
+msgstr "Broj piksela za podrezati od krajnjeg desnog y (zadano je %d)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:32
 msgid ""
@@ -1815,106 +2030,116 @@ msgid ""
 "\tCrops a pdf. \n"
 "\t"
 msgstr ""
+"\t%prog [opcije] file.pdf\n"
+"\n"
+"\tPodrezuje a pdf. \n"
+"\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
-msgstr ""
+msgstr "Često korišteni direktoriji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
+"Upotrijebiti ovaj format kod pohranjivanja pojedinačnih datoteka na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
-msgstr ""
+msgstr "Potvrdi prije brisanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
-msgstr ""
+msgstr "Veličina ikone alatne trake"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
-msgstr ""
+msgstr "Prikaži oznake gumba u alatnoj traci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
-msgstr ""
+msgstr "Geometrija glavnog prozora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
-msgstr ""
+msgstr "Obavijesti kad je nova inačica dostupna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
-msgstr ""
+msgstr "Upotrijebi Rimske brojeve za brojeve serija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
-msgstr ""
+msgstr "Svrstaj listu tagova po popularnosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
-msgstr ""
+msgstr "Broj omota za prikazati u modu pretraživanja omota"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
-msgstr ""
+msgstr "Podrazumijeva se za pretvorbu u LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
-msgstr ""
+msgstr "Opcije za LRF ebook preglednika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
-msgstr ""
+msgstr "Formati koji se pregledavaje upotrebom internog preglednika."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
+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:56
-msgid "Columns to be displayed in the book list"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
-msgstr ""
+msgstr "Najstarija vijest sadržana u bazi podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
-msgstr ""
+msgstr "Prikaži ikonu sustavnog poslužavnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
-msgstr ""
+msgstr "Pošalji skinute vijesti na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
-msgstr ""
+msgstr "Izbriši knjige iz biblioteke nakon slanja na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
-msgstr ""
+msgstr "Dodano %s u biblioteku"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:162
 msgid "Read metadata from "
-msgstr ""
+msgstr "Čitaj metapodatke sa "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:224
@@ -1922,92 +2147,240 @@ msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
+"<p>Knjige istog naslova kao slijedeće već postoje u bazi podataka. Dodaj ih, "
+"bez obzira?<ul>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:121
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:231
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:232
 msgid "Duplicates found!"
-msgstr ""
+msgstr "Pronađeni duplikati!"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:146
 msgid "Adding books recursively..."
-msgstr ""
+msgstr "Dodavanje knjiga suvratno..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:147
 msgid "Searching for books in all sub-directories..."
-msgstr ""
+msgstr "Pretraga za knjigama u svim pod-direktorijima..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:176
 msgid "Adding books to database..."
-msgstr ""
+msgstr "Dodavanje knjiga u bazu podataka..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
-msgstr ""
+msgstr "Čitanje metapodataka..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:193
 msgid "Searching in"
-msgstr ""
+msgstr "Pretraživanje u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
-msgstr ""
+msgstr "Uređaj nije više priključen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
-msgstr ""
+msgstr "Uzmi podatke o uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
-msgstr ""
+msgstr "Uzmi listu knjiga na uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
-msgstr ""
+msgstr "Pošalji metapodatke na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
-msgstr ""
+msgstr "Pošalji %d knjige na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
-msgstr ""
+msgstr "Izbriši knjige sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
-msgstr ""
+msgstr "Skini knjige sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
+msgstr "Pregledaj knjigu na uređaju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "i izbriši iz biblioteke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr "Postavi zadanu akciju slanja na uređaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr "Email"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Pošalji u glavnu memoriju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Pošalji na memorijsku karticu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr "Pošalji specifičan format u glavnu memoriju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr "Pošalji specifičan format na memorijsku karticu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr "Nema knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr "odabrano za slanje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr "Odaberi format za poslati na uređaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr "Nema uređaja"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+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:417
+msgid "No card"
+msgstr "Nema kartice"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+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:449
+msgid "E-book:"
+msgstr "E-knjiga:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr "Priloženo, pronaći ćete e-knjigu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "od"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr "u %s formatu."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr "Slanje e-pošte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Nema odgovarajućih formata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
 msgstr ""
+"Nemoguće poslati e-poštom slijedeće knjige pošto odgovarajući formati nisu "
+"pronađeni: <br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr "Neuspjelo slanje knjiga e-poštom"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr "Neuspjelo slanje e-poštom slijedećih knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr "Pošalji e-poštom:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr "Vijesti:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr "Priloženo je"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr "Vijesti poslane u"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Slanje vijesti na uređaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Slanje knjiga na uređaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Nemoguće poslati slijedeće knjige na uređaj, pošto odgovarajući formati nisu "
+"pronađeni:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Nema prostora na uređaju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Nemoguće poslati knjige na uređaj, nema dovoljno slobodnog prostora "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
-msgstr ""
+msgstr "Put"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
-msgstr ""
+msgstr "Formati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:52
 msgid "Dialog"
-msgstr ""
+msgstr "Diajlog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
@@ -2018,69 +2391,69 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
-msgstr ""
+msgstr "OznakaTeksta"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
 msgid "&Previous"
-msgstr ""
+msgstr "&Prethodni"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
 msgid "&Next"
-msgstr ""
+msgstr "&Slijedeći"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
-msgstr ""
+msgstr "Odaberi Format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
-msgstr ""
+msgstr "Postavi zadane vrijednosti za pretvorbu stripova (CBR/CBZ datoteke)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
 msgid "Set options for converting %s"
-msgstr ""
+msgstr "Postavi opcije za pretvorbu %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
-msgstr ""
+msgstr "&Naslov:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
-msgstr ""
+msgstr "&Autor(i):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
 msgid "&Number of Colors:"
-msgstr ""
+msgstr "&Broj Boja:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:502
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:540
 msgid "&Profile:"
-msgstr ""
+msgstr "&Profil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 msgid "Disable &normalize"
-msgstr ""
+msgstr "Onesposobi &normalize"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 msgid "Keep &aspect ratio"
-msgstr ""
+msgstr "Održi &aspect ratio"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
 msgid "Disable &Sharpening"
-msgstr ""
+msgstr "Onesposobi &Sharpening"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
 msgid "&Landscape"
-msgstr ""
+msgstr "&Pejsaž"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
 msgid "Don't so&rt"
-msgstr ""
+msgstr "Ne so&rt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101
 msgid "&Right to left"
-msgstr ""
+msgstr "&S desna na lijevo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102
 msgid "De&speckle"
@@ -2088,149 +2461,205 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
 msgid "&Wide"
-msgstr ""
+msgstr "&Širok"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
-msgstr ""
+msgstr " priključci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
+"Epoštanska\n"
+"Dostava"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
-msgstr ""
+msgstr "Uopćen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
-msgstr ""
+msgstr "Sučelje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Napredan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
+"Sadržajni\n"
+"Poslužitelj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
+msgstr "Priključci"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr "Auto slanje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr "Epošta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+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/dialogs/config.py:150
+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/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:224
+msgid "new email address"
+msgstr "nova epoštanska adresa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr "Završi gmail postavku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr "Ne zaboravite unijeti gmail korisničko ime i lozinku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr "Loša konfiguracija"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr "Morate postaviti epoštansku adresu pošiljaoca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr "Morate postaviti korisničko ime i lozinku poštanskog poslužitelja."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
-msgstr ""
+msgstr "Nema puta važećeg priključka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
-msgstr ""
+msgstr "%s nije put važećeg priključka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
-msgstr ""
+msgstr "Odaberi priključak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
-msgstr ""
+msgstr "Priključak ne može biti onesposobljen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
-msgstr ""
+msgstr "Priključak: %s ne može biti onesposobljen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
-msgstr ""
+msgstr "Priključak nije prilagodljiv"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
-msgstr ""
+msgstr "Priključak: %s ne treba prilagođavanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
-msgstr ""
+msgstr "Prilagodi %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
-msgstr ""
+msgstr "Nemoguće ukloniti ugrađeni priključak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
+" nemoguće ukloniti. Ovo je ugrađeni priključak. Pokušajte ga onesposobiti."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
-msgstr ""
+msgstr "Dnevnik grešaka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
-msgstr ""
+msgstr "Dnevnik pristupa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
-msgstr ""
+msgstr "Neuspješan start sadržajnog poslužitelja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr "Odaberi lokaciju baze podataka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
-msgstr ""
+msgstr "Nevažeća veličina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
-msgstr ""
+msgstr "Veličina %s je nevažeća. Mora biti u formatu širinaxvisina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
-msgstr ""
+msgstr "Nevažeća lokacija baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
-msgstr ""
+msgstr "Nevažeća lokacija baze podataka "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Mora biti direktorij."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
-msgstr ""
+msgstr "Nevažeća lokacija baze podataka.<br>Nemoguće pisati u "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
-msgstr ""
+msgstr "Sažimanje..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Sažimanje baze podataka. Ovo može uzeti vremena."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
+"&Lokacija elektroničkih knjiga (ebooks su pohranjene u mapama razvrstanim po "
+"autorima a metapodaci su pohranjeni u datoteci metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
-msgstr ""
+msgstr "Pretraži lokaciju za novu bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2248,211 +2677,325 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
-msgstr ""
+msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
-msgstr ""
+msgstr "Prikaži obavijest kad je &nova inačica dostupna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
-msgstr ""
+msgstr "Čitaj metapodatke iz datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
-msgstr ""
+msgstr " sekundi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
-msgstr ""
+msgstr "Normalan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
-msgstr ""
+msgstr "Visoko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
-msgstr ""
+msgstr "Nisko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
-msgid "Free unused diskspace from the database"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
-msgid "&Compact database"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
-msgid "&Metadata from file name"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
 msgid ""
-"calibre contains a network server that allows you to access your book "
-"collection using a browser from anywhere in the world. Any changes to the "
-"settings will only take effect after a server restart."
+"<p>This is what will be present in the From: field of emails sent by "
+"calibre.<br> Set it to your email address"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
-msgid "Server &port:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+"calibre može <b>opcionalno</b> upotrijebiti poslužitelj za slanje pošte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+"Ulaz kojeg vaš poštanski poslužitelj koristi za povezivanje. Standardan je "
+"25."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr "Vaše korisničko ime na poštanskom serveru"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr "Vaša lozinka na poštanskom poslužitelju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+"Upotrijebi TLS enkripciju kod povezivanja sa poštanskim poslužiteljem. Ovo "
+"je najuobičajenije."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr "&TLS"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+"Upotrijebi SSL enkripciju kod povezivanja sa poštanskim poslužiteljem."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr "&SSL"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr "Upotrijebi Gmail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
+msgid "Free unused diskspace from the database"
+msgstr "Slobodan neiskorišten prostor na disku iz baze podataka."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
+msgid "&Compact database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
+msgid "&Metadata from file name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
+msgid ""
+"calibre contains a network server that allows you to access your book "
+"collection using a browser from anywhere in the world. Any changes to the "
+"settings will only take effect after a server restart."
+msgstr ""
+"calibre sadrži mrežni poslužitelj koji vam omogućava pristup vašoj kolekciji "
+"knjiga koristeći pretraživač od bilo gdje u svijetu. Sve promjene u "
+"postavkama će uzeti efekta samo nakon onovnog pokretanja poslužitelja."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
+msgid "Server &port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
+"Ako ostavite lozinku praznu, svatko će imati pristup vašoj kolekciji knjiga "
+"koristeći web sučelje."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
+"Maksimalna veličina (širinaxvisina) za izložene omote. Veći omoti su "
+"smanjeni. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2461,39 +3004,41 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
+"Ovdje možete prilagoditi ponašanje Calibre kontrolirajući koje priključke "
+"upotrebljava."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
-msgstr ""
+msgstr "Dodaj novi priključak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
-msgstr ""
+msgstr "Jeste li sigurni?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
@@ -2501,7 +3046,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
-msgstr ""
+msgstr "GREŠKA"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:52
 msgid "Bulk convert to "
@@ -2515,31 +3060,31 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
-msgstr ""
+msgstr "Metapodaci"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
 msgid "Look & Feel"
-msgstr ""
+msgstr "Izgled i Osjećaj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
 msgid "Page Setup"
-msgstr ""
+msgstr "Postavke Stranice"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300
 msgid "Chapter Detection"
-msgstr ""
+msgstr "Otkrivanje Poglavlja"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 msgid ""
@@ -2547,96 +3092,100 @@ msgid ""
 "\n"
 "Metadata will be updated in the database as well as the generated %s file."
 msgstr ""
+"Specificiraj metapodatke kao naslov i autor knjige.\n"
+"\n"
+"Metapodaci će biti obnovljeni u bazi podataka kao i generiranoj %s datoteci."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
 msgid ""
 "Adjust the look of the generated ebook by specifying things like font sizes."
 msgstr ""
+"Podesi izgled generirane eknjige specificirajući stvari kao veličinu pisma."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
 msgid "Specify the page layout settings like margins."
-msgstr ""
+msgstr "Specificiraj postavke izgleda stranice kao margine."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300
 msgid "Fine tune the detection of chapter and section headings."
-msgstr ""
+msgstr "Fino podesi otkrivanje zaglavlja poglavlja i odlomaka."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167
 msgid "Choose cover for "
-msgstr ""
+msgstr "Odaberi omot za "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
-msgstr ""
+msgstr "Nemoguće čitati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
-msgstr ""
+msgstr "Vi nemate dozvole da čitate datoeku: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
-msgstr ""
+msgstr "Greška kod čitanja datoteke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
-msgstr ""
+msgstr "<p>Imate grešku čitanja iz datoteke: <br><b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:190
 msgid " is not a valid picture"
-msgstr ""
+msgstr " nije važeća slika"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
-msgstr ""
+msgstr "Nemoguće pretvoriti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:243
 msgid "This book has no available formats"
-msgstr ""
+msgstr "Ova knjiga nema dostupne formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:248
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:93
 msgid "No available formats"
-msgstr ""
+msgstr "Nema dostupnih formata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:249
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:94
 msgid "Cannot convert %s as this book has no supported formats"
-msgstr ""
+msgstr "Nemoguće pretvoriti %s pošto ova knjiga nema podržane formate."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:253
 msgid "Choose the format to convert to "
-msgstr ""
+msgstr "Odaberi format u koji pretvoriti "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:265
 msgid "Invalid XPath expression"
-msgstr ""
+msgstr "Nevažeći XPath izraz"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:266
 msgid "The expression %s is invalid. Error: %s"
-msgstr ""
+msgstr "Izraz %s je nevažeći. Greška: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:467
 msgid "Convert to EPUB"
-msgstr ""
+msgstr "Pretvori u EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:468
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:496
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 msgid "Book Cover"
-msgstr ""
+msgstr "Omot Knjige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:469
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:497
@@ -2648,7 +3197,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:498
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Browse for an image to use as the cover of this book."
-msgstr ""
+msgstr "Pretraži za sliku koju bi upotrijebili kao omot knjige."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:472
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:500
@@ -2665,7 +3214,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:502
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:331
 msgid "Change the title of this book"
-msgstr ""
+msgstr "Promijeni naslov ove knjige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:475
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:503
@@ -2681,6 +3230,8 @@ msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
 "an &. If the author name contains an &, use && to represent it."
 msgstr ""
+"Promijeni autora(e) ove knjige. Mnogostruki autori bi trebali biti odvojeni "
+"sa &. Ako autorovo ime sardži &, upotrijebi &&."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:477
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:505
@@ -2693,6 +3244,8 @@ msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by a "
 "comma"
 msgstr ""
+"Promijeni autora(e) ove knjige. Mnogostruki autori bi trebali biti odvojeni "
+"zarezom."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:479
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
@@ -2705,7 +3258,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 msgid "Change the publisher of this book"
-msgstr ""
+msgstr "Promijeni izdavača ove knjige."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:481
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
@@ -2721,6 +3274,8 @@ msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
 msgstr ""
+"Tagovi kategoriziraju knjigu. Ovo je posebno korisno kod pretraživanja. "
+"<br><br>Oni mogu biti bilo riječi ili fraze, odvojene zarezima."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:483
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
@@ -2738,7 +3293,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:349
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:350
 msgid "List of known series. You can add new series."
-msgstr ""
+msgstr "Lista poznatih serija. Vi možete dodati nove serije."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:486
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:487
@@ -2747,13 +3302,13 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
 msgid "Series index."
-msgstr ""
+msgstr "Indeks serija."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:488
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:516
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
 msgid "Book "
-msgstr ""
+msgstr "Knjiga "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:490
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:524
@@ -2771,7 +3326,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:510
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:512
 msgid " pt"
-msgstr ""
+msgstr " pt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:493
 msgid "Remove &spacing between paragraphs"
@@ -2807,7 +3362,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:501
 msgid "Override &CSS"
-msgstr ""
+msgstr "Nadvladaj &CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:503
 msgid "&Source profile:"
@@ -2905,11 +3460,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:527
 msgid "Level &1 TOC"
-msgstr ""
+msgstr "Razina &1 TOC"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:528
 msgid "Level &2 TOC"
-msgstr ""
+msgstr "Razina &2 TOC"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:529
 msgid "&Title for generated TOC"
@@ -2917,49 +3472,56 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:530
 msgid "Level &3 TOC"
-msgstr ""
+msgstr "Razina &3 TOC"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
-msgstr ""
+msgstr "Svrstavanje Autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
-msgstr ""
+msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr "Pronalaženje metapodataka..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr "Nemoguće pronaći metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr "Skidanje metapodataka je izgleda zastalo. Probajte ponovo kasnije."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr "Nemoguće ugrabiti metapodatke od:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
-msgstr ""
+msgstr "Metapodaci nisu pronađeni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
+"Metapodaci nisu pronađeni, probajte podesiti naslov i autora ili ISBN ključ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr ""
+msgid "Fetch metadata"
+msgstr "Prigrabi metapodatke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -2968,32 +3530,32 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:81
 msgid "Fetch"
-msgstr ""
+msgstr "Prigrabi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:82
 msgid "Matches"
-msgstr ""
+msgstr "Podudarnosti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:83
 msgid ""
 "Select the book that most closely matches your copy from the list below"
-msgstr ""
+msgstr "Odaberite knjigu koja najbliže odgovara vašoj kopiji sa donje liste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
-msgstr ""
+msgstr "Detalji posla"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:27
 msgid "Unavailable"
-msgstr ""
+msgstr "Nedostupan"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:38
 msgid " - Jobs"
-msgstr ""
+msgstr " - Poslovi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:38
 msgid "Active Jobs"
-msgstr ""
+msgstr "Aktivni Poslovi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:39
 msgid "&Stop selected job"
@@ -3001,47 +3563,52 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:98
 msgid "Choose the format to convert into LRF"
-msgstr ""
+msgstr "Odaberi format za pretvorbu u LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:106
 msgid "Convert %s to LRF"
-msgstr ""
+msgstr "Pretvori %s u LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:360
 msgid "Set conversion defaults"
-msgstr ""
+msgstr "Postavi zadane vrijednosti pretvorbe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:258
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:341
 msgid "No preprocessing"
-msgstr ""
+msgstr "Bez predprosiranja"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:261
 msgid ""
 "Preprocess the file before converting to LRF. This is useful if you know "
 "that the file is from a specific source. Known sources:"
 msgstr ""
+"Predprocesira datoteku prije pretvaranja u LRF. Ovo je korisno ako da je "
+"datoteka iz određenog izvora. Poznati izvori:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:262
 msgid "<ol><li><b>baen</b> - Books from BAEN Publishers</li>"
-msgstr ""
+msgstr "<ol><li><b>baen</b> - Knjige od BAEN Izdavača</li>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:263
 msgid ""
 "<li><b>pdftohtml</b> - HTML files that are the output of the program "
 "pdftohtml</li>"
 msgstr ""
+"<li><b>pdftohtml</b> - HTML datoteke koje su rezultat programa pdftohtml</li>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:264
 msgid "<li><b>book-designer</b> - HTML0 files from Book Designer</li>"
-msgstr ""
+msgstr "<li><b>book-designer</b> - HTML0 datoteke od Book Designer</li>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
 msgid ""
 "Specify metadata such as title and author for the book.<p>Metadata will be "
 "updated in the database as well as the generated LRF file."
 msgstr ""
+"Specificiraj metapodatke kao naslov i autor knjige. <p>Metapodaci će biti "
+"obnovljeni u bazi podataka kao i u generiranoj LRF datoteci."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
 msgid ""
@@ -3278,58 +3845,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3409,84 +3994,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3884,11 +4470,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3973,45 +4559,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -4040,7 +4630,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4087,148 +4677,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4244,436 +4815,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4859,84 +5395,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4987,44 +5523,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5383,6 +5919,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5569,35 +6109,35 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:663
 msgid "Could not fetch article. Run with --debug to see the reason"
-msgstr ""
+msgstr "Nemoguće prigrabiti artikal. Izvedi sa --debug da vidiš razloge."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:688
 msgid "Got feeds from index page"
-msgstr ""
+msgstr "Dobijeni dotoci sa indeks stranice"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
 msgid "Trying to download cover..."
-msgstr ""
+msgstr "Pokušaj skidanja omota..."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
 msgid "Starting download [%d thread(s)]..."
-msgstr ""
+msgstr "Početak skidanja [%d thread(s)]..."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:763
 msgid "Feeds downloaded to %s"
-msgstr ""
+msgstr "Dotoci skinuti na %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
 msgid "Could not download cover: %s"
-msgstr ""
+msgstr "Nemoguće skinuti omot: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:780
 msgid "Downloading cover from %s"
-msgstr ""
+msgstr "Skidanje omota sa %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:913
 msgid "Untitled Article"
-msgstr ""
+msgstr "Artikal bez naslova"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:968
 msgid ""
@@ -5605,49 +6145,59 @@ msgid ""
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
+"\n"
+"Skinut artikal %s sa %s\n"
+"%s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
 msgid "Article downloaded: %s"
-msgstr ""
+msgstr "Skinuti artikli: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:980
 msgid "Failed to download article: %s from %s\n"
-msgstr ""
+msgstr "Neuspjelo skidanje artikla: %s sa %s\n"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Article download failed: %s"
-msgstr ""
+msgstr "Neuspjelo skidanje artikla: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
-msgstr ""
+msgstr "Grabljenje dotoka"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Hrvatski"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Srpski"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5695,7 +6245,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5745,73 +6295,81 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_xkcd.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zdnet.py:17
 msgid "English"
-msgstr ""
+msgstr "Engleski"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Španski"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
-msgstr ""
+msgstr "Francuski"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_de_standaard.py:12
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_demorgen_be.py:16
 msgid "Dutch"
-msgstr ""
+msgstr "Holandski"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr "Bosanski"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
 msgid "Portugese"
-msgstr ""
+msgstr "Portugalski"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_faznet.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
 msgid "German"
-msgstr ""
+msgstr "Njemački"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:12
 msgid "Kovid Goyal"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
+msgstr "Kovid Goyal"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
-msgstr ""
+msgstr "Talijanski"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:83
 msgid "Skipping duplicated article: %s"
-msgstr ""
+msgstr "Preskakanje dupliciranog artikla: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:88
 msgid "Skipping filtered article: %s"
-msgstr ""
+msgstr "Preskakanje filtriranog artikla: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
@@ -5819,23 +6377,30 @@ msgid ""
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
+"%prog URL\n"
+"\n"
+"Gdje URL je na primjer http://google.com"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
 msgid "Base directory into which URL is saved. Default is %default"
-msgstr ""
+msgstr "Osnovni direktorij u koji je URL pohranjen. Standardan je %default"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:463
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
+"Makismalan broj razina za suvrat, kao dubina veze za slijediti. Standardno "
+"%default"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:466
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
+"Maksimalan broj datoteka za skinuti. Ovo se samo odnosi na datoteke sa <a "
+"href> tagovima. Standardno je %default."
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
 msgid "Show detailed output information. Useful for debugging"
-msgstr ""
+msgstr "Prikaži detaljne izlazne podatke. Korisno kod otkrivanja grešaka."
diff --git a/src/calibre/translations/hu.po b/src/calibre/translations/hu.po
index 03f7b53144..49631c4d9c 100644
--- a/src/calibre/translations/hu.po
+++ b/src/calibre/translations/hu.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-02-26 18:17+0000\n"
 "Last-Translator: Molnár Gábor <csirkus@gmail.com>\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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Semmit nem csinál"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Metaadat olvasása %s fájlból"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Borító kinyerése a képregény fájlokból"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Tömörített könyvek metaadatait is olvassa be"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Metaadatok olvasása a RAR-ral tömörített könyvekből is"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Metaadatok beállítása a %s típusú fájlokban."
 
@@ -229,17 +237,17 @@ msgstr "A bővítmény letiltása"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Az e-könyv olvasóhoz nincs memóriakártya csatlakoztatva."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Nincs elég hely a memóriakártyán."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Nincs elég hely a fő memóriában"
 
@@ -567,7 +575,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "Nem találtam e-könyvet a tömörített fájlban."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -585,14 +593,14 @@ msgstr ""
 "takes from\n"
 "the <spine> element of the OPF file.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Kimenetet sikeresen írtam ide: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Meg kell adnod egy HTML fájlt bemenetként"
 
@@ -615,26 +623,26 @@ msgstr ""
 "\t\tTúl sok formázás. Újradarabolom a szerkezet megőrzése nélkül. Ez "
 "helytelen megjelenést eredményezhet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Feldolgozott HTML-t kiírtam ide: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Beállítások a HTML fájlok feldolgozásához"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Célkönyvtár. Az alapértelmezett a jelenlegi könyvtár."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "A HTML fájloknál használt karakterkódolás. Alapértelmezés az automatikus "
 "felismerés."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -642,18 +650,18 @@ msgstr ""
 "A kimenet zip fájlba legyen tömörítve. Ha ez az opció be van kapcsolva, az --"
 "output kapcsoló után egy fájlnevet kell megadni, nem egy könyvtárnevet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "A HTML fájlok linkjeinek követése"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 "HTML linkek szélességi követése. Az alapértelmezés a mélységi követés."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -661,41 +669,41 @@ msgstr ""
 "HTML linkek követésének maximális mélysége. Nem-negatív számot kell megadni. "
 "0 esetén a linkek követése ki lesz kapcsolva."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "A létrehozott könyvek metaadatainak beállítása"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 "Cím beállítása. Ha nincs semmi beírva, megpróbálom automatikusan "
 "megállapítani."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "A könyv szerzői '&' jelekkel elválasztott listában megadva."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "A könyv témája/témái, vesszővel elválasztva."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "A könyv kiadója."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Rövid összefoglaló a könyvről."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Meta-adatok betöltése a megadott OPF fájlból."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Hibakereséshez hasznd beállítások"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -703,12 +711,12 @@ msgstr ""
 "Beszédesebb kimenet feldolgozás közben. Többszöri megadásra további infókat "
 "ír ki."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "A kimenet HTML kód \"szépen formázott\" lesz a könnyebb olvashatóság kedvéért"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -738,7 +746,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [beállítások] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Célkönyvtár. Az alapértelmezett a jelenlegi könyvtár."
 
@@ -753,7 +761,7 @@ msgid "Useful for debugging."
 msgstr "Hasznos hibakeresésnél."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "Az OEB e-könyvet létrehoztam ennyi idő alatt:"
 
@@ -796,9 +804,9 @@ msgid "Sort key for the author"
 msgstr "Rendezési kulcs a szerzőhöz"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Kiadó"
 
@@ -1648,63 +1656,63 @@ msgstr "Szerzők"
 msgid "Set the comment"
 msgstr "Megjegyzés"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Cím"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Szerző(k)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Megjegyzés"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Cimkék"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Sorozat"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Nyelv"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Dátum"
 
@@ -1820,7 +1828,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1836,11 +1844,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -2007,97 +2015,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -2134,7 +2146,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -2142,43 +2154,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -2187,7 +2339,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2285,143 +2438,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2439,211 +2641,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2652,33 +2955,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2706,7 +3009,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2760,26 +3063,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2789,7 +3092,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -3110,47 +3413,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3469,58 +3778,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3600,84 +3927,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4075,11 +4403,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -4164,45 +4492,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -4231,7 +4563,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4278,148 +4610,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4435,436 +4748,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Új könyv"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Könyv törlése"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Konvertálás"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5050,84 +5328,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5178,44 +5456,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5574,6 +5852,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5811,34 +6093,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5886,7 +6175,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5938,20 +6227,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5959,6 +6255,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5967,6 +6264,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5977,7 +6278,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5988,10 +6289,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index 8c4f0c0950..657a84d5b2 100644
--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-02-24 14:28+0000\n"
 "Last-Translator: Luca Cipriani <luca.opensource@gmail.com>\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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -24,13 +24,14 @@ msgid "Does absolutely nothing"
 msgstr "Non fa assolutamente niente"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -47,21 +48,23 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -69,21 +72,25 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -139,27 +146,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Legge i metadati da file %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Estrae le copertine dai file dei fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Leggi i metadati da un ebook nell'archivio ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Leggi i metadati da un ebook nell'archivio RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Organizza i metadati in %s file"
 
@@ -230,17 +238,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Il lettore non ha una scheda di memoria connessa."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Non c'è spazio a sufficienza nella scheda di memoria"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Non c'è spazio a sufficienza nella memoria principale"
 
@@ -536,7 +544,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "Impossibile trovare un libro dentro l'archivio"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -554,14 +562,14 @@ msgstr ""
 "presa\n"
 "dall'elemento <spine> del file OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Output scritto in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "È necessario specificare un file HTML"
 
@@ -584,25 +592,25 @@ msgstr ""
 "\t\tTroppo markup. Divido di nuovo senza preservare la struttura. Questo "
 "potrebbe portare a problemi nella visualizzazione."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "HTML processato scritto in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Opzioni per controllare l'analisi completa dell'HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Cartella in uscita. Predefinita: cartella corrente"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Codifica caratteri per i file HTML. Predefinito: rilevamento automatico."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -610,11 +618,11 @@ msgstr ""
 "Crea l'output in un file zip. Se questa opzione è specificata, --output "
 "dovrebbe essere il nome di un file, non di una cartella."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Controlla come vengono seguiti i link nei file HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -622,7 +630,7 @@ msgstr ""
 "Analizza tutti i link nei file HTML in ordine di grandezza. Normalmente, i "
 "link sono analizzati in ordine di profondità"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -630,39 +638,39 @@ msgstr ""
 "Massimo livello di ricorsività nel seguire i link in HTML. Deve essere un "
 "numero non negativo. 0 significa che i link non vengono seguiti."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Impostare i metadati del libro generato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Impostare il titolo. Predefinito: rilevato automaticamente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Il soggetto(i) di questo libro, come elenco separato da virgole."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Impostare l'editore di questo libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Un riassunto di questo libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Carica i metadati dal file OPF specificato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Opzioni utili per il debugging"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -670,13 +678,13 @@ msgstr ""
 "Più dettagliato durante il processo. Può essere specificato più volte per "
 "aumentare il dettaglio."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Rendere l'HTML in uscita \"ben stampato\", per una comprensione più facile "
 "da parte dell'uomo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -697,7 +705,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [opzioni] FILELIT"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Cartella in uscita. Predefinita: cartella corrente."
 
@@ -714,7 +722,7 @@ msgid "Useful for debugging."
 msgstr "Utile per il debugging"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "Libro OEB creato in"
 
@@ -758,9 +766,9 @@ msgid "Sort key for the author"
 msgstr "Chiave per la classificazione dell'autore"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Editore"
 
@@ -1666,63 +1674,63 @@ msgstr "Imposta gli autori"
 msgid "Set the comment"
 msgstr "Imposta il commento"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Titolo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autore(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Produttore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Commenti"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Tag"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Lingua"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Timestamp"
 
@@ -1856,7 +1864,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Imposta il campo dc:language"
 
@@ -1872,11 +1880,11 @@ msgstr "Uso: rb-meta file.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [opzioni] miolibro.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "MOBI HTML raw salvato in"
 
@@ -2043,102 +2051,106 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Cartelle usate frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr "Formato da utilizzare per il salvataggio di singoli file sul disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Chiedi conferma prima di eliminare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Dimensione bottoni nella barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Mostra testo nei bottoni della barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Geometria della finestra principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr "Avverti quando è disponibile una nuova versione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 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:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Ordina la lista dei tag per popolarità"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Parametri predefiniti per la conversione in LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Opzioni del lettore di libri LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 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:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "Notizie più vecchie da mantenere nel database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Mostra un'icona nel vassoio di sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Carica le notizie scaricate sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 "Elimina i libri dalla biblioteca dopo averle caricate sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -2177,7 +2189,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -2185,43 +2197,187 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Dispositivo non più collegato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Ottieni informazioni sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Ottieni la lista dei libri del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Invia metadati al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Carica %d libri nel dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Cancella libri dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Scarica libri dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Visualizza libro sul dispositivo"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "ed elimina dalla biblioteca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Invia alla memoria principale"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Invia alla scheda di memoria"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "di"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Nessun formato adatto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Invio notizie al dispositivo in corso."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Invio libri al dispositivo."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Impossibile caricare i seguenti libri nel dispositivo, perché non è stato "
+"trovato nessun formato adatto:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Spazio insufficiente sul dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Impossibile salvare libri sul dispositivo perché non c'è più spazio "
+"disponibile "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Percorso"
@@ -2230,7 +2386,8 @@ msgstr "Percorso"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2329,27 +2486,29 @@ msgstr "&Largo"
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " plug-in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "di"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Avanzata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Generale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Avanzata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2357,103 +2516,150 @@ msgstr ""
 "Server dei\n"
 "contenuti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Plug-in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Personalizza %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "File di log degli errori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "File di log degli accessi:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Avvio del server dei contenuti fallito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Dimensione non valida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 "La dimensione %s non è valida. Deve essere nella forma larghezzaxaltezza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Percorso database non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Deve essere una cartella"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Percorso database non valido "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Deve essere una cartella"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Percorso database non valido.<br>Impossibile scrivere su "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Compattazione database. Poterbbe richiedere un po' di tempo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Compattazione..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Compattazione database. Poterbbe richiedere un po' di tempo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2461,16 +2667,16 @@ msgstr ""
 "Per&corso dei libri (I libri sono salvati in cartelle salvate per autore e i "
 "metadati sono salvati nel file metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Sfoglia per specificare una nuova posizione del database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2488,36 +2694,36 @@ msgstr "Sfoglia per specificare una nuova posizione del database"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "&Visualizza un avvertimento quando è disponibile una nuova versione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Leggi &metadati dai file"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "&Formato per salvataggio singolo file:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "&Timeout predefinito della rete:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2525,111 +2731,224 @@ msgstr ""
 "Imposta il timeout predefinito per gli scaricamenti dalla rete (cioè ogni "
 "volta che si usa Internet per prelevare informazioni)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " secondi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Scegliere la ling&ua (richiede il riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Massima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Minima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "&Priorità lavoro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Aggiunge una cartella alla lista delle cartelle usate frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Rimuove una cartella dalla lista delle cartelle usate frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "&Usa numeri romani per i numeri delle serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Abilita l'icona nel vassoio di sistema (richiede il riavvio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Invia automaticamente le noti&zie scaricate al lettore di libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "&Elimina le notizie dalla biblioteca dopo averle inviate al lettore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Media"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Piccola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Dimensione bottoni nella barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "&Mostra testo nei bottoni della barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "&Selezionare le colonne visibili nella vista biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "&Nome utente:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Password:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Libera lo spazio non utilizzato dal database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Compatta database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadati dal nome del file"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2640,23 +2959,11 @@ msgstr ""
 "Qualsiasi cambiamento nella configurazione verrà attivato solo dopo il "
 "riavvio del server."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "&Porta del server:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "&Nome utente:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Password:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2664,13 +2971,13 @@ msgstr ""
 "Se si lascia la password in bianco, chiunque potrà accedere alla propria "
 "collezione di libri utilizzando l'interfaccia web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Mostra password"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2678,31 +2985,31 @@ msgstr ""
 "La dimensione massima (larghezzaxaltezza) per le copertine visualizzate. Le "
 "copertine più larghe vengono ridimensionate. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Dimensi&one massima copertina:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "A&vvia il server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "&Ferma il server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Test sul server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "Avvia a&utomaticamente il server all'apertura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Visualizza i file di l&og del server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2716,33 +3023,33 @@ msgstr ""
 "proprio iphone. Mionomehost deve essere il nome host completo o l'indirizzo "
 "IP del computer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Aggiungi"
 
@@ -2770,7 +3077,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadati"
@@ -2827,26 +3134,26 @@ msgstr "Seleziona copertina per "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Impossibile leggere"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Non si hanno i permessi per leggere il file: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Errore nella lettura del file"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Si è verificato un errore nella lettura del file: <br /><b>"
 
@@ -2856,7 +3163,7 @@ msgid " is not a valid picture"
 msgstr " non è un'immagine valida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
@@ -3187,54 +3494,56 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Classificazione autore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Impossibile connettersi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
-"È necessario specificare delle chiavi d'accesso valide per isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Errore nello scaricamento dei metadati"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Messun metadato trovato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Nessun metadato trovato, provare ad aggiustare il titolo e l'autore o il "
 "codice ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Scarica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Scaricamento metadati per <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Sottoscrivere un account gratuito su <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> per ottenere delle chiavi "
-"d'accesso."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3576,33 +3885,33 @@ msgstr "Rimuovi for&mato:"
 msgid "A&utomatically set author sort"
 msgstr "Imposta a&utomaticamente la Classificazione autore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3612,26 +3921,44 @@ msgstr ""
 "<br/>Se non se ne possiede uno, è possibile <a "
 "href='http://www.librarything.com'>registrarsi</a> gratuitamente!</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Impossibile scaricare la copertina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "È necessario specificare il codice ISBN di questo libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Impossibile scaricare la copertina</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "È necessario specificare il codice ISBN di questo libro"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3713,84 +4040,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Cerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d formule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr "È necessario inserire le informazioni dell'account"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr "Questa formula richiede nome utente e password"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Creato da: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Ultimo scaricamento: mai"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Programmare lo scaricamento delle notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Aggiungi una fonte di notizie personalizzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4235,11 +4563,11 @@ msgstr "Espressione regolare (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
@@ -4324,45 +4652,49 @@ msgstr "Impossibile annullare i processi che comunicano col dispositivo"
 msgid "Job has already run"
 msgstr "Il lavoro è già stato avviato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Dimensione (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Giudizio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Nessuno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Libro <font face=\"serif\">%s</font> di %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "Non permesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Doppio clic per <b>modificarmi</b><br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Cerca (Per la ricerca avanzata fare clic sul bottone a sinistra)"
 
@@ -4391,7 +4723,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Nessuna corrispondenza</b> trovata per la frase <i>%s</i>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Nessuna corrispondenza trovata"
 
@@ -4438,23 +4770,23 @@ msgstr "Apri libro"
 msgid "Configure"
 msgstr "Configurazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Ripristina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Riavvia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4462,126 +4794,107 @@ msgstr ""
 "<p>Per aiuto visitare <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s di <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Invia alla memoria principale"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Invia alla scheda di memoria"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "ed elimina dalla biblioteca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Invia alla scheda di memoria come imposazione predefinita"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Modifica metadati individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Modifica metadati in gruppo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Aggiungi libri da una singola cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Salva su disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Salva su disco in una singola cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Salva sul disco solo il formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Leggi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Leggi uno specifico formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Converti individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Converti in gruppo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Imposta i parametri predefiniti per la conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Imposta i parametri predefiniti per la conversione di fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Libri simili..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Percorso del database sbagliato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Scegliere un percorso per la propria biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " individuato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Connesso "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Database del dispositivo corrotto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4610,129 +4923,94 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Caricamento libri nel dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "Libri EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "Libri LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "Libri HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "Libri LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "Libri MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Libri TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "Libri PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Archivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Spazio insufficiente sul dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>Impossibile salvare libri sul dispositivo perché non c'è più spazio "
-"disponibile "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Cancellamento libri dal dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Impossibile modificare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Invio notizie al dispositivo in corso."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Invio libri al dispositivo."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Nessun formato adatto"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"Impossibile caricare i seguenti libri nel dispositivo, perché non è stato "
-"trovato nessun formato adatto:<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Impossibile salvare sul disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Scegliere la cartella di destinazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4740,64 +5018,64 @@ msgstr ""
 "<p>Impossibile salvare i libri seguenti su disco, perché il formato %s non è "
 "disponibile per loro:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Impossibile salvare alcuni libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Scaricamento notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr " preso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Impossibile leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Scegliere il formato da leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "Impossibile aprire la cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s non ha formati disponibili"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossibile configurare mentre ci sono lavori in esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Sto copiando il database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Copia biblioteca in "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Database non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4805,25 +5083,25 @@ msgstr ""
 "<p>Esiste già un database non valido in %s, eliminarlo prima di provare a "
 "spostare il database esistente.<br>Errore: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Impossibile spostare il database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Nessuna informazione dettagliata disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Non è disponibile alcuna informazione dettagliata per i libri nel "
 "dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4831,13 +5109,13 @@ msgstr ""
 "Si è verificato un errore di comunicazione temporaneo col dispositivo. "
 "Disconnettere e riconnettere il dispositivo e/o riavviare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Errore di conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4846,15 +5124,15 @@ msgstr ""
 "href=\"%s\">DRM</a>. È necessario rimuovere prima il DRM usando programmi di "
 "terze parti."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4862,22 +5140,22 @@ msgstr ""
 "è il risultato degli sforzi di tanti volontari da tutto il mondo. Se lo "
 "trovi utile, puoi fare una donazione per supportare il suo sviluppo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Ci sono lavori attivi. Uscire comunque?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr "ATTENZIONE: Lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -4885,7 +5163,7 @@ msgstr ""
 "continuerà a lavorare nel vassoio di sistema. Per chiuderlo, selezionare "
 "<b>Esci</b> nel menu contestuale del vassoio di sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4893,7 +5171,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Ultima versione: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Aggiornamento disponibile"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4903,49 +5185,45 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuove "
 "funzionalità</a>. Una visita alla pagina del download?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Aggiornamento disponibile"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr "Usa la biblioteca collocata nel percorso specificato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr "Invia le informazioni di debug alla console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "File in uscita:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Ricerca avanzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4953,7 +5231,7 @@ msgstr ""
 "Cerca nella lista dei libri per titolo o autore<br><br>Parole separate da "
 "spazi hanno come operatore AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4961,113 +5239,109 @@ msgstr ""
 "Cerca nella lista dei libri per titolo, autore, editore, tag e "
 "commenti<br><br>Parole separate da spazi hanno come operatore AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Resetta ricerca veloce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Fai corrispondere uno qualsiasi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Fai corrispondere tutti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Ordina per p&opolarità"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Aggiungi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Rimuovi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Canc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Modifica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Invia al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Scarica notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Converti libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr "Apri la cartella contenente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr "Visualizza i dettagli del libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Libri dello stesso autore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Libri in questa serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr "Libri di questo editore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Libri con lo stesso tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5261,86 +5535,86 @@ msgstr "La dimensione dei caratteri a spaziatura fissa in px"
 msgid "The standard font type"
 msgstr "Il tipo di carattere predefinito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Vai a..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Posizione nel libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Sconosciuto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 "Vai a un riferimento. Per ottenere i numeri di riferimento, usare la "
 "modalità riferimento."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Cerca del testo nel libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "Scelta libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "Libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Aggiungi segnalibro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Inserire il titolo per il segnalibro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr "Nessuna corrispondenza trovata per %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "Caricamento..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr "Impaginazione %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "Caricamento libro..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Questo libro è protetto da <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "Errore DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "Impossibile aprire il libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5394,15 +5668,15 @@ msgstr "Segnalibro"
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Espressione regolare non valida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Espressione regolare non valida: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5412,7 +5686,7 @@ msgstr ""
 "%d\n"
 "libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
@@ -5422,7 +5696,7 @@ msgstr ""
 "%s\n"
 "disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
@@ -5432,18 +5706,18 @@ msgstr ""
 "%s\n"
 "disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 "Fare clic per vedere la lista di libri disponibili sul proprio computer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Fare clic per vedere la lista di libri nella memoria principale del proprio "
 "lettore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Fare clic per vedere la lista di libri nella scheda di memoria del proprio "
@@ -5892,6 +6166,10 @@ msgstr "Negoziazione della sessione SSH fallita: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Autenticazione fallita col server: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -6186,34 +6464,41 @@ msgstr "Scaricamento fallito dell'articolo: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Scaricamento feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6261,7 +6546,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6313,20 +6598,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -6334,6 +6626,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -6342,6 +6635,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6352,7 +6649,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6363,10 +6660,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
@@ -6419,6 +6712,24 @@ msgstr "Mostra un output dettagliato. Utile per il debugging"
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "Pri&orità per i lavori di conversione:"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Impossibile connettersi"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr ""
+#~ "È necessario specificare delle chiavi d'accesso valide per isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Scaricamento metadati per <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Sottoscrivere un account gratuito su <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> per ottenere delle chiavi "
+#~ "d'accesso."
+
 #~ msgid "Options"
 #~ msgstr "Opzioni"
 
@@ -6487,9 +6798,6 @@ msgstr "Mostra un output dettagliato. Utile per il debugging"
 #~ msgid "Regular expression group name (?P<series_index>)"
 #~ msgstr "Nome del gruppo per l'espressione regolare (?P<series_index>)"
 
-#~ msgid "Double click to <b>edit</b> me<br><br>"
-#~ msgstr "Doppio clic per <b>modificarmi</b><br><br>"
-
 #~ msgid ""
 #~ "Add books recursively (One book per directory, assumes every ebook file is "
 #~ "the same book in a different format)"
@@ -6579,6 +6887,12 @@ msgstr "Mostra un output dettagliato. Utile per il debugging"
 #~ "Campi disponibili: %s\n"
 #~ "Predefinito: %%default"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Errore nello scaricamento dei metadati"
+
+#~ msgid "Send to storage card by default"
+#~ msgstr "Invia alla scheda di memoria come imposazione predefinita"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "&Numero di copertine da visualizzare nella modalità di sfogliatura (richiede "
diff --git a/src/calibre/translations/ja.po b/src/calibre/translations/ja.po
new file mode 100644
index 0000000000..ac7ca66793
--- /dev/null
+++ b/src/calibre/translations/ja.po
@@ -0,0 +1,6076 @@
+# Japanese translation for calibre
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the calibre package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: calibre\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-25 08:20+0000\n"
+"Last-Translator: Kovid Goyal <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: 2009-03-27 02:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "まったく何もしません。（何も影響しません。）"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:62
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:96
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:100
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:102
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:82
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1150
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:263
+#: /home/kovid/work/calibre/src/calibre/library/database.py:916
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:490
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:872
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:907
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1214
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1216
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1396
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1419
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1470
+#: /home/kovid/work/calibre/src/calibre/library/server.py:327
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:51
+msgid "Unknown"
+msgstr "不明です。"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "基礎"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "ファイル形式"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "メタデータ読み込み"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "メタデータ書き出し"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+"HTMLファイル内の全てのリンクに従い、全てのリンクファイルを含んだZIPファイルを作成します。このプラグインは、HTMLファイルをライブラリーに追加する"
+"時にいつでも実行します。"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:43
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:64
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:74
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:84
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
+msgid "Read metadata from %s files"
+msgstr "%sファイルからメタデータを読み込みます。"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
+msgid "Extract cover from comic files"
+msgstr "コミックファイルから表紙を取り出します。"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
+msgid "Read metadata from ebooks in ZIP archives"
+msgstr "ZIPアーカイブ内のイーブックス(ebooks)からメタデータを読み込みます。"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
+msgid "Read metadata from ebooks in RAR archives"
+msgstr ""
+
+#: /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:248
+msgid "Set metadata in %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:185
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:262
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:268
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:270
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:272
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:274
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:276
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
+msgid "The reader has no storage card connected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
+msgid "There is insufficient free space on the storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
+msgid "There is insufficient free space in main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:168
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:195
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:231
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:258
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:94
+msgid "Options to control the conversion to EPUB"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+msgid ""
+"The output EPUB file. If not specified, it is derived from the input file "
+"name."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
+msgid ""
+"Profile of the target device this EPUB is meant for. Set to None to create a "
+"device independent EPUB. The profile is used for device specific "
+"restrictions on the EPUB. Choices are: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+msgid ""
+"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
+"existing CSS declarations in the source files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+msgid "Control auto-detection of document structure."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:122
+msgid ""
+"An XPath expression to detect chapter titles. The default is to consider "
+"<h1> or\n"
+"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
+"\"part\" as chapter titles as \n"
+"well as any tags that have class=\"chapter\". \n"
+"The expression used must evaluate to a list of elements. To disable chapter "
+"detection,\n"
+"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
+"for further\n"
+"help on using this feature.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+msgid ""
+"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
+"page breaks before chapters. A value of \"rule\" will insert a line before "
+"chapters. A value of \"none\" will disable chapter marking and a value of "
+"\"both\" will use both page breaks and lines to mark chapters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
+msgid "Path to the cover to be used for this book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:142
+msgid ""
+"Use the cover detected from the source file in preference to the specified "
+"cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
+msgid ""
+"Turn off splitting at page breaks. Normally, input files are automatically "
+"split at every page break into two files. This gives an output ebook that "
+"can be parsed faster and with less resources. However, splitting is slow and "
+"if your source file contains a very large number of page breaks, you should "
+"turn off splitting on page breaks."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
+msgid ""
+"XPath expression to detect page boundaries for building a custom pagination "
+"map, as used by AdobeDE. Default is not to build an explicit pagination map."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
+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 "
+"with 1."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:165
+msgid ""
+"Control the automatic generation of a Table of Contents. If an OPF file is "
+"detected\n"
+"and it specifies a Table of Contents, then that will be used rather than "
+"trying\n"
+"to auto-generate a Table of Contents.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:171
+msgid ""
+"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
+"is: %default. Links are only added to the TOC if less than the --toc-"
+"threshold number of chapters were detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:175
+msgid "Don't add auto-detected chapters to the Table of Contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:177
+msgid ""
+"If fewer than this number of chapters is detected, then links are added to "
+"the Table of Contents. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:180
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level one. If this is specified, it takes precedence over "
+"other forms of auto-detection."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:184
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level two. Each entry is added under the previous level one "
+"entry."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:188
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level three. Each entry is added under the previous level two "
+"entry."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:192
+msgid ""
+"Path to a .ncx file that contains the table of contents to use for this "
+"ebook. The NCX file should contain links relative to the directory it is "
+"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
+"an overview of the NCX format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:198
+msgid ""
+"Normally, if the source file already has a Table of Contents, it is used in "
+"preference to the auto-generated one. With this option, the auto-generated "
+"one is always used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:202
+msgid "Control page layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:204
+msgid "Set the top margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:206
+msgid "Set the bottom margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:208
+msgid "Set the left margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:210
+msgid "Set the right margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:212
+msgid ""
+"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
+"rescaling of fonts."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:215
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:221
+msgid "Do not force text to be justified in output."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:223
+msgid ""
+"Remove table markup, converting it into paragraphs. This is useful if your "
+"source file uses a table to manage layout."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:226
+msgid ""
+"Preserve the HTML tag structure while splitting large HTML files. This is "
+"only neccessary if the HTML files contain CSS that uses sibling selectors. "
+"Enabling this greatly slows down processing of large HTML files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:232
+msgid "Print generated OPF file to stdout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:234
+msgid "Print generated NCX file to stdout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:237
+msgid "Keep intermediate files during processing by html2epub"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:239
+msgid ""
+"Extract the contents of the produced EPUB file to the specified directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:186
+msgid ""
+"%%prog [options] filename\n"
+"\n"
+"Convert any of a large number of ebook formats to a %s file. Supported "
+"formats are: %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:105
+msgid "Could not find an ebook inside the archive"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
+msgid ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Convert a HTML file to an EPUB ebook. Recursively follows links in the HTML "
+"file.\n"
+"If you specify an OPF file instead of an HTML file, the list of links is "
+"takes from\n"
+"the <spine> element of the OPF file.  \n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
+msgid "You must specify an input HTML file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/iterator.py:36
+msgid "%s format books are not supported"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:30
+msgid ""
+"Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:142
+msgid ""
+"\t\tToo much markup. Re-splitting without structure preservation. This may "
+"cause incorrect rendering."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
+msgid "Written processed HTML to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
+msgid "Options to control the traversal of HTML"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
+msgid "The output directory. Default is the current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
+msgid "Character encoding for HTML files. Default is to auto detect."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
+msgid ""
+"Create the output in a zip file. If this option is specified, the --output "
+"should be the name of a file not a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
+msgid "Control the following of links in HTML files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
+msgid ""
+"Traverse links in HTML files breadth first. Normally, they are traversed "
+"depth first"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
+msgid ""
+"Maximum levels of recursion when following links in HTML files. Must be non-"
+"negative. 0 implies that no links in the root HTML file are followed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
+msgid "Set metadata of the generated ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
+msgid "Set the title. Default is to autodetect."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
+msgid "The author(s) of the ebook, as a & separated list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+msgid "The subject(s) of this book, as a comma separated list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
+msgid "Set the publisher of this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
+msgid "A summary of this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
+msgid "Load metadata from the specified OPF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
+msgid "Options useful for debugging"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
+msgid ""
+"Be more verbose while processing. Can be specified multiple times to "
+"increase verbosity."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
+msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
+msgid ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Follow all links in an HTML file and collect them into the specified "
+"directory.\n"
+"Also collects any resources like images, stylesheets, scripts, etc. \n"
+"If an OPF file is specified instead, the list of files in its <spine> "
+"element\n"
+"is used.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
+msgid "Creating LIT file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:892
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:898
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:901
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:731
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:578
+msgid "Useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
+msgid "OEB ebook created in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:725
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:728
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_feeds.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:575
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76
+msgid "Set the title. Default: filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:78
+msgid ""
+"Set the author(s). Multiple authors should be set as a comma separated list. "
+"Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+msgid "Set the comment."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
+msgid "Set the category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:85
+msgid "Sort key for the title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
+msgid "Sort key for the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
+msgid "Publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:91
+msgid "Path to file containing image to be used as cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:93
+msgid ""
+"If there is a cover graphic detected in the source file, use that instead of "
+"the specified cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:96
+msgid "Output file name. Default is derived from input filename"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:98
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:550
+msgid ""
+"Render HTML tables as blocks of text instead of actual tables. This is "
+"neccessary if the HTML contains very large or complex tables."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:101
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:103
+msgid "Enable autorotation of images that are wider than the screen width."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:106
+msgid "Set the space between words in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:108
+msgid "Separate paragraphs by blank lines."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:110
+msgid "Add a header to all the pages with title and author."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:112
+msgid ""
+"Set the format of the header. %a is replaced by the author and %t by the "
+"title. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:114
+msgid "Add extra spacing below the header. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:116
+msgid ""
+"Override the CSS. Can be either a path to a CSS stylesheet or a string. If "
+"it is a string it is interpreted as CSS."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:118
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:120
+msgid ""
+"Minimum paragraph indent (the indent of the first line of a paragraph) in "
+"pts. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:122
+msgid ""
+"Increase the font size by 2 * FONT_DELTA pts and the line spacing by "
+"FONT_DELTA pts. FONT_DELTA can be a fraction.If FONT_DELTA is negative, the "
+"font size is decreased."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:127
+msgid ""
+"Render all content as black on white instead of the colors specified by the "
+"HTML or CSS."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:133
+msgid ""
+"Profile of the target device for which this LRF is being generated. The "
+"profile determines things like the resolution and screen size of the target "
+"device. Default: %s Supported profiles: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:139
+msgid "Left margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:141
+msgid "Right margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:143
+msgid "Top margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:145
+msgid "Bottom margin of page. Default is %default px."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:147
+msgid ""
+"Render tables in the HTML as images (useful if the document has large or "
+"complex tables)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:149
+msgid ""
+"Multiply the size of text in rendered tables by this factor. Default is "
+"%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:154
+msgid ""
+"The maximum number of levels to recursively process links. A value of 0 "
+"means thats links are not followed. A negative value means that <a> tags are "
+"ignored."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:158
+msgid ""
+"A regular expression. <a> tags whose href matches will be ignored. Defaults "
+"to %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:162
+msgid "Don't add links to the table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:166
+msgid "Prevent the automatic detection chapters."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:169
+msgid ""
+"The regular expression used to detect chapter titles. It is searched for in "
+"heading tags (h1-h6). Defaults to %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:172
+msgid ""
+"Detect a chapter beginning at an element having the specified attribute. The "
+"format for this option is tagname regexp,attribute name,attribute value "
+"regexp. For example to match all heading tags that have the attribute "
+"class=\"chapter\" you would use \"h\\d,class,chapter\". You can set the "
+"attribute to \"none\" to match only on tag names. So for example, to match "
+"all h2 tags, you would use \"h2,none,\". Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:174
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:184
+msgid ""
+"Force a page break before tags whose names match this regular expression."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:186
+msgid ""
+"Force a page break before an element having the specified attribute. The "
+"format for this option is tagname regexp,attribute name,attribute value "
+"regexp. For example to match all heading tags that have the attribute "
+"class=\"chapter\" you would use \"h\\d,class,chapter\". Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:189
+msgid "Add detected chapters to the table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:192
+msgid "Preprocess Baen HTML files to improve generated LRF."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:194
+msgid ""
+"You must add this option if processing files generated by pdftohtml, "
+"otherwise conversion will fail."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:196
+msgid "Use this option on html0 files from Book Designer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:199
+msgid ""
+"Specify trutype font families for serif, sans-serif and monospace fonts. "
+"These fonts will be embedded in the LRF file. Note that custom fonts lead to "
+"slower page turns. For example: --serif-family \"Times New Roman\"\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:207
+msgid "The serif family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:210
+msgid "The sans-serif family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:213
+msgid "The monospace family of fonts to embed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:217
+msgid "Be verbose while processing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:219
+msgid "Convert to LRS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:221
+msgid ""
+"Minimize memory usage at the cost of longer processing times. Use this "
+"option if you are on a memory constrained machine."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:223
+msgid ""
+"Specify the character encoding of the source file. If the output LRF file "
+"contains strange characters, try changing this option. A common encoding for "
+"files from windows computers is cp-1252. Another common choice is utf-8. The "
+"default is to try and guess the encoding."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
+msgid "Converting from %s to LRF is not supported."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
+msgid ""
+"any2lrf [options] myfile\n"
+"\n"
+"Convert any ebook format into LRF. Supported formats are:\n"
+"LIT, RTF, TXT, HTML, EPUB, MOBI, PRC and PDF. any2lrf will also process a "
+"RAR or\n"
+"ZIP archive, looking for an ebook inside the archive.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
+msgid "No file to convert specified."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:225
+msgid "Rendered %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:228
+msgid "Failed %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+msgid ""
+"Failed to process comic: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:287
+msgid ""
+"Options to control the conversion of comics (CBR, CBZ) files into ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+msgid "Title for generated ebook. Default is to use the filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:22
+msgid ""
+"Path to output file. By default a file is created in the current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
+msgid "Number of colors for grayscale image conversion. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
+msgid ""
+"Disable normalize (improve contrast) color range for pictures. Default: False"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
+msgid "Maintain picture aspect ratio. Default is to fill the screen."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
+msgid "Disable sharpening."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
+msgid ""
+"Disable trimming of comic pages. For some comics, trimming might remove "
+"content as well as borders."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+msgid "Don't split landscape images into two portrait images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+msgid ""
+"Keep aspect ratio and scale image using screen height as image width for "
+"viewing in landscape mode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+msgid ""
+"Used for right-to-left publications like manga. Causes landscape pages to be "
+"split into portrait pages from right to left."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:317
+msgid ""
+"Enable Despeckle. Reduces speckle noise. May greatly increase processing "
+"time."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:319
+msgid ""
+"Don't sort the files found in the comic alphabetically by name. Instead use "
+"the order they were added to the comic."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:321
+msgid ""
+"Choose a profile for the device you are generating this file for. The "
+"default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
+"suitable for any reader with the same screen size. Choices are %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:20
+msgid ""
+"Be verbose, useful for debugging. Can be specified multiple times for "
+"greater verbosity."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:325
+msgid "Don't show progress bar."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:328
+msgid "Apply no processing to the image"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:333
+msgid ""
+"%prog [options] comic.cb[z|r]\n"
+"\n"
+"Convert a comic in a CBZ or CBR file to an ebook. \n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:393
+msgid "Output written to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:553
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_comic.py:35
+msgid "Rendering comic pages..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/epub/convert_from.py:17
+msgid ""
+"Usage: %prog [options] mybook.epub\n"
+"        \n"
+"        \n"
+"%prog converts mybook.epub to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:23
+msgid ""
+"%prog [options] mybook.fb2\n"
+"\n"
+"\n"
+"%prog converts mybook.fb2 to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:28
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:24
+msgid "Print generated HTML to stdout and quit."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:30
+msgid "Keep generated HTML files after completing conversion to LRF."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:20
+msgid "Options to control the behavior of feeds2disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:22
+msgid "Options to control the behavior of html2lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:44
+msgid "Fetching of recipe failed: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:321
+msgid "\tBook Designer file detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:323
+msgid "\tParsing HTML..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:346
+msgid "\tBaen file detected. Re-parsing..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:362
+msgid "Written preprocessed HTML to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:380
+msgid "Processing %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:394
+msgid "\tConverting to BBeB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:540
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:553
+msgid "Could not parse file: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+msgid "%s is an empty file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:565
+msgid "Failed to parse link %s %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:609
+msgid "Cannot add link %s to TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
+msgid "Unable to process image %s. Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1003
+msgid "Unable to process interlaced PNG %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1018
+msgid ""
+"Could not process image: %s\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772
+msgid ""
+"An error occurred while processing a table: %s. Ignoring table markup."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
+msgid ""
+"Bad table:\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796
+msgid "Table has cell that is too large"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1826
+msgid ""
+"You have to save the website %s as an html file first and then run html2lrf "
+"on it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1869
+msgid "Could not read cover image: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1872
+msgid "Cannot read from: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1997
+msgid "Failed to process opf file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lit/convert_from.py:15
+msgid ""
+"Usage: %prog [options] mybook.lit\n"
+"\n"
+"\n"
+"%prog converts mybook.lit to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
+msgid ""
+"%prog book.lrf\n"
+"Convert an LRF file into an LRS (XML UTF-8 encoded) file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
+msgid "Output LRS file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
+msgid "Do not save embedded image and font files to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
+msgid "Parsing LRF..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
+msgid "Creating XML..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
+msgid "LRS written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:266
+msgid "Could not read from thumbnail file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:286
+msgid ""
+"%prog [options] file.lrs\n"
+"Compile an LRS file into an LRF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:287
+msgid "Path to output file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:116
+msgid "Verbose processing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:291
+msgid "Convert LRS to LRS, useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:455
+msgid "Invalid LRF file. Could not set metadata."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:580
+msgid ""
+"%prog [options] mybook.lrf\n"
+"\n"
+"\n"
+"Show/edit the metadata in an LRF file.\n"
+"\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:587
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:43
+msgid "Set the book title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
+msgid "Set sort key for the title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
+msgid "Set the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
+msgid "Set sort key for the author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:47
+msgid "The category this book belongs to. E.g.: History"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:598
+msgid "Path to a graphic that will be set as this files' thumbnail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:601
+msgid ""
+"Path to a txt file containing the comment to be stored in the lrf file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:605
+msgid "Extract thumbnail from LRF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:606
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:191
+msgid "Set the publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
+msgid "Set the book classification"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
+msgid "Set the book creator"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
+msgid "Set the book producer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613
+msgid "Set book ID"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/mobi/convert_from.py:43
+msgid ""
+"Usage: %prog [options] mybook.mobi|prc\n"
+"\n"
+"\n"
+"%prog converts mybook.mobi to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:48
+msgid "Could not find pdftohtml, check it is in your PATH"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:74
+msgid ""
+" is an image based PDF. Only conversion of text based PDFs is supported."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:93
+msgid ""
+"%prog [options] mybook.pdf\n"
+"\n"
+"\n"
+"%prog converts mybook.pdf to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:403
+msgid ""
+"Path to output directory in which to create the HTML file. Defaults to "
+"current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:405
+msgid "Be more verbose."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:417
+msgid "You must specify a single PDF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:21
+msgid ""
+"%prog [options] mybook.rtf\n"
+"\n"
+"\n"
+"%prog converts mybook.rtf to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:146
+msgid ""
+"This RTF file has a feature calibre does not support. Convert it to HTML and "
+"then convert it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:19
+msgid ""
+"%prog [options] mybook.txt\n"
+"\n"
+"\n"
+"%prog converts mybook.txt to mybook.lrf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:45
+msgid "Set the authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:49
+msgid "Set the comment"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+msgid "Title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+msgid "Author(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
+msgid "Producer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
+msgid "Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
+msgid "Language"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
+msgid "Timestamp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+msgid "A comma separated list of tags to set"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:204
+msgid "The series to which this book belongs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:206
+msgid "The series index"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:208
+msgid "The book language"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:210
+msgid "Extract the cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54
+msgid "Usage:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:53
+msgid "Usage: imp-meta file.imp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:60
+msgid "No filename specified."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:97
+msgid ""
+"\n"
+"%prog [options] key\n"
+"\n"
+"Fetch metadata for books from isndb.com. You can specify either the \n"
+"books ISBN ID or its title and author. If you specify the title and author,\n"
+"then more than one book may be returned.\n"
+"\n"
+"key is the account key you generate after signing up for a free account from "
+"isbndb.com.\n"
+"\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108
+msgid "The ISBN ID of the book you want metadata for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
+msgid "The author whose book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
+msgid "The title of the book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114
+msgid "The publisher of the book to search for."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:46
+msgid "LibraryThing.com timed out. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
+msgid ""
+"Could not fetch cover as server is experiencing high load. Please try again "
+"later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:54
+msgid " not found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:57
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:88
+msgid "LibraryThing.com server error. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:66
+msgid ""
+"\n"
+"%prog [options] ISBN\n"
+"\n"
+"Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:43
+msgid "Usage: %s file.lit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:236
+msgid "Cover saved to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:187
+msgid "Set the subject tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:189
+msgid "Set the language"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:193
+msgid "Set the ISBN"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
+msgid "Set the dc:language field"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:58
+msgid "Usage: pdf-meta file.pdf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:59
+msgid "Usage: rb-meta file.rb"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_any.py:55
+msgid "Creating Mobipocket file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
+msgid "%prog [options] myebook.mobi"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
+msgid "Raw MOBI HTML saved in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:534
+msgid "Options to control the conversion to MOBI"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:541
+msgid "Mobipocket-specific options."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:543
+msgid ""
+"Compress file text using PalmDOC compression. Results in smaller files, but "
+"takes a long time to run."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:546
+msgid "Modify images to meet Palm device size limitations."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:548
+msgid "Title for any generated in-line table of contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:554
+msgid ""
+"When present, use the author sorting information for generating the "
+"Mobipocket author metadata."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:556
+msgid ""
+"Device renderer profiles. Affects conversion of font sizes, image rescaling "
+"and rasterization of tables. Valid profiles are: %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:561
+msgid "Source renderer profile. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:564
+msgid "Destination renderer profile. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:572
+msgid "[options]"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:590
+msgid "Unknown source profile %r"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:594
+msgid "Unknown destination profile %r"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:57
+msgid "The output directory. Defaults to the current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:822
+msgid "Cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:823
+msgid "Title Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:18
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+msgid "Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:825
+msgid "Index"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:826
+msgid "Glossary"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:827
+msgid "Acknowledgements"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:828
+msgid "Bibliography"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:829
+msgid "Colophon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:830
+msgid "Copyright"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:831
+msgid "Dedication"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:832
+msgid "Epigraph"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:833
+msgid "Foreword"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:834
+msgid "List of Illustrations"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:835
+msgid "List of Tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:836
+msgid "Notes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:837
+msgid "Preface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:838
+msgid "Main Text"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:13
+msgid "Options to control the transformation of pdf"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:24
+msgid "Number of pixels to crop from the left most x (default is %d) "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:26
+msgid "Number of pixels to crop from the left most y (default is %d) "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:28
+msgid "Number of pixels to crop from the right most x (default is %d) "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:30
+msgid "Number of pixels to crop from the right most y (default is %d)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:32
+msgid ""
+"A file generated by ghostscript which allows each page to be individually "
+"cropped [gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox > bounding] "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:38
+msgid ""
+"\t%prog [options] file.pdf\n"
+"\n"
+"\tCrops a pdf. \n"
+"\t"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
+msgid "Frequently used directories"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
+msgid "Send file to storage card instead of main memory by default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
+msgid "The format to use when saving single files to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
+msgid "Confirm before deleting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
+msgid "Toolbar icon size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
+msgid "Show button labels in the toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
+msgid "Main window geometry"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
+msgid "Notify when a new version is available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+msgid "Use Roman numerals for series number"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
+msgid "Sort tags list by popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
+msgid "Number of covers to show in the cover browsing mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
+msgid "Defaults for conversion to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+msgid "Options for the LRF ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
+msgid "Formats that are viewed using the internal viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
+msgid "Columns to be displayed in the book list"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Automatically launch content server on application startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Oldest news kept in database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
+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:66
+msgid "Disable notifications from the system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
+msgid "Added %s to library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:162
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:224
+msgid ""
+"<p>Books with the same title as the following already exist in the database. "
+"Add them anyway?<ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:232
+msgid "Duplicates found!"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:146
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:147
+msgid "Searching for books in all sub-directories..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:176
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:193
+msgid "Searching in"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
+msgid "Device no longer connected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
+msgid "Get device information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
+msgid "Get list of books on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+msgid "Send metadata to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
+msgid "Upload %d books to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
+msgid "Delete books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
+msgid "Download books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
+msgid "View book on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+msgid "Path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:52
+msgid "Dialog"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
+msgid "TextLabel"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
+msgid "&Previous"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
+msgid "&Next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
+msgid "Choose Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
+msgid "Set defaults for conversion of comics (CBR/CBZ files)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
+msgid "Set options for converting %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
+msgid "&Title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
+msgid "&Author(s):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
+msgid "&Number of Colors:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:540
+msgid "&Profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
+msgid "Disable &normalize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
+msgid "Keep &aspect ratio"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
+msgid "Disable &Sharpening"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
+msgid "&Landscape"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
+msgid "Don't so&rt"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101
+msgid "&Right to left"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102
+msgid "De&speckle"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
+msgid "&Wide"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
+msgid "Disable &Trimming"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
+msgid " plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid ""
+"Content\n"
+"Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
+msgid "Error log:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
+msgid "Access log:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
+msgid "Failed to start content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
+msgid "Invalid database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
+msgid "Invalid database location "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
+msgid "Invalid database location.<br>Cannot write to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
+msgid "Compacting..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+msgid "Configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
+msgid ""
+"&Location of ebooks (The ebooks are stored in folders sorted by author and "
+"metadata is stored in the file metadata.db)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
+msgid "Browse for the new database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
+msgid "..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
+msgid "Show notification when &new version is available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
+msgid ""
+"If you disable this setting, metadata is guessed from the filename instead. "
+"This can be configured in the Advanced section."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
+msgid "Read &metadata from files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
+msgid "Format for &single file save:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
+msgid "Default network &timeout:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
+msgid ""
+"Set the default timeout for network fetches (i.e. anytime we go out to the "
+"internet to get information)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
+msgid " seconds"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
+msgid "Choose &language (requires restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
+msgid "Normal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
+msgid "High"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
+msgid "Low"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
+msgid "Job &priority:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
+msgid "Add a directory to the frequently used directories list"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
+msgid "Remove a directory from the frequently used directories list"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
+msgid "Use &Roman numerals for series number"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
+msgid "Show &notifications in system tray"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
+msgid "Show cover &browser in a separate window (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
+msgid "&Number of covers to show in browse mode (needs restart):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
+msgid "Toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
+msgid "Large"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
+msgid "Medium"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
+msgid "Small"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
+msgid "&Button size in toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
+msgid "Show &text in toolbar buttons"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
+msgid "Select visible &columns in library view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
+msgid "Use internal &viewer for:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
+msgid "Free unused diskspace from the database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
+msgid "&Compact database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
+msgid "&Metadata from file name"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
+msgid ""
+"calibre contains a network server that allows you to access your book "
+"collection using a browser from anywhere in the world. Any changes to the "
+"settings will only take effect after a server restart."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
+msgid "Server &port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
+msgid ""
+"If you leave the password blank, anyone will be able to access your book "
+"collection using the web interface."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
+msgid "&Show password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
+msgid "&Start Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
+msgid "St&op Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
+msgid "&Test Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
+msgid "Run server &automatically on startup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
+msgid "View &server logs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
+msgid ""
+"If you want to use the content server to access your ebook collection on "
+"your iphone with Stanza, you will need to add the URL "
+"http://myhostname:8080/stanza as a new catalog in the stanza reader on your "
+"iphone. Here myhostname should be the fully qualified hostname or the IP "
+"address of this computer."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
+msgid "ERROR"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:52
+msgid "Bulk convert to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:54
+msgid "Convert %s to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+msgid "Metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
+msgid "Look & Feel"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
+msgid "Page Setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300
+msgid "Chapter Detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
+msgid ""
+"Specify metadata such as title and author for the book.\n"
+"\n"
+"Metadata will be updated in the database as well as the generated %s file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
+msgid ""
+"Adjust the look of the generated ebook by specifying things like font sizes."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
+msgid "Specify the page layout settings like margins."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300
+msgid "Fine tune the detection of chapter and section headings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167
+msgid "Choose cover for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
+msgid "Cannot read"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
+msgid "You do not have permission to read the file: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
+msgid "Error reading file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
+msgid "<p>There was an error reading from file: <br /><b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:190
+msgid " is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
+msgid "Cannot convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:243
+msgid "This book has no available formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:93
+msgid "No available formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:94
+msgid "Cannot convert %s as this book has no supported formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:253
+msgid "Choose the format to convert to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:265
+msgid "Invalid XPath expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:266
+msgid "The expression %s is invalid. Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:467
+msgid "Convert to EPUB"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
+msgid "Book Cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+msgid "Change &cover image:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+msgid "Browse for an image to use as the cover of this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:500
+msgid "Use cover from &source file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:330
+msgid "&Title: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:331
+msgid "Change the title of this book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:334
+msgid "&Author(s): "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
+msgid ""
+"Change the author(s) of this book. Multiple authors should be separated by "
+"an &. If the author name contains an &, use && to represent it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:505
+msgid "Author So&rt:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:506
+msgid ""
+"Change the author(s) of this book. Multiple authors should be separated by a "
+"comma"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:343
+msgid "&Publisher: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:480
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+msgid "Change the publisher of this book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:481
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:344
+msgid "Ta&gs: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:345
+msgid ""
+"Tags categorize the book. This is particularly useful while searching. "
+"<br><br>They can be any words or phrases, separated by commas."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:483
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:348
+msgid "&Series:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:484
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:350
+msgid "List of known series. You can add new series."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:486
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+msgid "Series index."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
+msgid "Book "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:524
+msgid "Source en&coding:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
+msgid "Base &font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:512
+msgid " pt"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:493
+msgid "Remove &spacing between paragraphs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:494
+msgid "Preserve &tag structure when splitting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:495
+msgid "&Rescale images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:496
+msgid "&Ignore tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:497
+msgid "&Use author sort to set author field in output"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:498
+msgid "No text &justification"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:499
+msgid "&Linearize tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:500
+msgid "Remove &first image from source file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:501
+msgid "Override &CSS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:503
+msgid "&Source profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:504
+msgid "&Destination profile:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:541
+msgid "&Left Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:543
+msgid "&Right Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:545
+msgid "&Top Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:547
+msgid "&Bottom Margin:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:513
+msgid "Do not &split on page breaks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:514
+msgid "&Page map"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:515
+msgid ""
+"<p>You can control how calibre detects page boundaries using a XPath "
+"expression. To learn how to use XPath expressions see the <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">XPath "
+"tutorial</a>. The page boundaries are useful only if you want a mapping from "
+"pages in a paper book, to locations in the e-book. This controls where Adobe "
+"Digital Editions displays the page numbers in the right margin.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:516
+msgid "&Boundary XPath:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:517
+msgid "&Name XPath:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:518
+msgid "Automatic &chapter detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:519
+msgid ""
+"<p>You can control how calibre detects chapters using a XPath expression. To "
+"learn how to use XPath expressions see the <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">XPath "
+"tutorial</a></p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:520
+msgid "&XPath:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:521
+msgid "Chapter &mark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:522
+msgid "Automatic &Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:523
+msgid "Number of &links to add to Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:524
+msgid "Do not add &detected chapters to the Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:525
+msgid "Chapter &threshold"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:526
+msgid "&Force use of auto-generated Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:527
+msgid "Level &1 TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:528
+msgid "Level &2 TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:529
+msgid "&Title for generated TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:530
+msgid "Level &3 TOC"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
+msgid "Author Sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
+msgid "ISBN"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
+msgid "No metadata found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
+msgid ""
+"No metadata found, try adjusting the title and author or the ISBN key."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
+msgid "Fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
+msgid ""
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
+msgid "&Access Key:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:81
+msgid "Fetch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:82
+msgid "Matches"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:83
+msgid ""
+"Select the book that most closely matches your copy from the list below"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
+msgid "Details of job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:27
+msgid "Unavailable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:38
+msgid " - Jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:38
+msgid "Active Jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:39
+msgid "&Stop selected job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:98
+msgid "Choose the format to convert into LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:106
+msgid "Convert %s to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:360
+msgid "Set conversion defaults"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:341
+msgid "No preprocessing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:261
+msgid ""
+"Preprocess the file before converting to LRF. This is useful if you know "
+"that the file is from a specific source. Known sources:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:262
+msgid "<ol><li><b>baen</b> - Books from BAEN Publishers</li>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:263
+msgid ""
+"<li><b>pdftohtml</b> - HTML files that are the output of the program "
+"pdftohtml</li>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:264
+msgid "<li><b>book-designer</b> - HTML0 files from Book Designer</li>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
+msgid ""
+"Specify metadata such as title and author for the book.<p>Metadata will be "
+"updated in the database as well as the generated LRF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
+msgid ""
+"Adjust the look of the generated LRF file by specifying things like font "
+"sizes and the spacing between words."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
+msgid ""
+"Specify the page settings like margins and the screen size of the target "
+"device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:309
+msgid "<font color=\"gray\">No help available</font>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:412
+msgid "Bulk convert ebooks to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:494
+msgid "Convert to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:495
+msgid "Category"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:528
+msgid " pts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
+msgid "Embedded Fonts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
+msgid "&Serif:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
+msgid "S&ans-serif:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
+msgid "&Monospace:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:525
+msgid "Minimum &indent:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
+msgid "&Word spacing:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:529
+msgid "Enable auto &rotation of images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:530
+msgid "Insert &blank lines between paragraphs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:531
+msgid "Ignore &tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:532
+msgid "Ignore &colors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:533
+msgid "&Preprocess:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:534
+msgid "Header"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:535
+msgid "&Show header"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:536
+msgid "&Header format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:109
+msgid " px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:538
+msgid "Header &separation:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:539
+msgid "Override<br>CSS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:549
+msgid "&Convert tables to images (good for large/complex tables)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:550
+msgid "&Multiplier for text size in rendered tables:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:551
+msgid "Title based detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:552
+msgid "&Disable chapter detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:553
+msgid "&Regular expression:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:554
+msgid "Add &chapters to table of contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:555
+msgid "Don't add &links to the table of contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:556
+msgid "Tag based detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:557
+msgid "&Page break before tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:558
+msgid "&Force page break before tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:559
+msgid "Force page break before &attribute:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:560
+msgid "Detect chapter &at tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:561
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+msgid "Edit Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:329
+msgid "Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:335
+msgid "Author S&ort: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:336
+msgid ""
+"Specify how the author(s) of this book should be sorted. For example Charles "
+"Dickens should be sorted as Dickens, Charles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:339
+msgid "&Rating:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:341
+msgid "Rating of this book. 0-5 stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:342
+msgid " stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+msgid "Add Ta&gs: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:347
+msgid "Open Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+msgid "&Remove tags:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+msgid "Comma separated list of tags to remove from the books. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+msgid "Remove &format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "No format selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
+msgid "Could not read metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
+msgid "Could not read metadata from %s format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
+msgid "Could not read cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
+msgid "Could not read cover from %s format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
+msgid "The cover in the %s format is invalid"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
+msgid ""
+"<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
+"do not have one, you can <a href='http://www.librarything.com'>register</a> "
+"for free!.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
+msgid "Cannot fetch cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
+msgid "<b>Could not fetch cover.</b><br/>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
+msgid "Edit Meta Information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:332
+msgid "Swap the author and title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:337
+msgid ""
+"Automatically create the author sort entry based on the current author entry"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:351
+msgid "Remove unused series (Series that have no books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+msgid "IS&BN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+msgid "&Fetch metadata from server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
+msgid "Available Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+msgid "Add a new format for this book to the database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
+msgid "Remove the selected formats for this book from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
+msgid "Set the cover for the book from the selected format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+msgid "Reset cover to default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
+msgid "Fetch &cover image from server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+msgid ""
+"Change the username and/or password for your account at LibraryThing.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+msgid "Change &password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
+msgid "Password needed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:43
+msgid "Aborting..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:40
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:138
+msgid "Custom"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
+msgid "Scheduled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
+msgid "Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "Monday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "Tuesday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "Wednesday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
+msgid "day"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Friday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Saturday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Sunday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
+msgid "Thursday"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
+msgid "Must set account information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
+msgid "This recipe requires a username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+msgid "%d days, %d hours and %d minutes ago"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+msgid "Last downloaded"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
+msgid "Last downloaded: never"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
+msgid "Schedule news download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
+msgid "Add a custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:816
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:820
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1135
+msgid "News"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+msgid "Recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:164
+msgid "Schedule for download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:165
+msgid "blurb"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:166
+msgid "&Schedule for download:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:169
+msgid "Every "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:168
+msgid "at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:170
+msgid ""
+"Interval at which to download this recipe. A value of zero means that the "
+"recipe will be downloaded every hour."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
+msgid " days"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:172
+msgid "&Account"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:176
+msgid "For the scheduling to work, you must leave calibre running."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:177
+msgid "&Download now"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:178
+msgid ""
+"Delete downloaded news older than the specified number of days. Set to zero "
+"to disable."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:180
+msgid "Delete downloaded news older than "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:96
+msgid "Form"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
+msgid "contains"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
+msgid "The text to search for. It is interpreted as a regular expression."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38
+msgid ""
+"<p>Negate this match. That is, only return results that <b>do not</b> match "
+"this query."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
+msgid "Negate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:88
+msgid "Advanced Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:89
+msgid "Find entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:90
+msgid "&All these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:91
+msgid "This exact &phrase:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:92
+msgid "&One or more of these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:93
+msgid "But dont show entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:94
+msgid "Any of these &unwanted words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:95
+msgid ""
+"See the <a href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-"
+"search-interface\">User Manual</a> for more help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+msgid "A&vailable tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+msgid ""
+"Delete tag from database. This will unapply the tag from all books and then "
+"remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+msgid "Apply tag to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+msgid "A&pplied tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+msgid "Unapply (remove) tag from current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+msgid "&Add tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+msgid ""
+"If the tag you want is not in the available list, you can add it here. "
+"Accepts a comma separated list of tags."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+msgid "Add tag to available tags and apply it to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:62
+msgid "No recipe selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:68
+msgid "The attached file: %s is a recipe to download %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
+msgid "Recipe for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255
+msgid "Switch to Advanced mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:99
+msgid "Switch to Basic mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:109
+msgid "Feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:110
+msgid "The feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:114
+msgid "Feed must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:115
+msgid "The feed %s must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:120
+msgid "Already exists"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:121
+msgid "This feed has already been added to the recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+msgid "Invalid input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+msgid "<p>Could not create recipe. Error:<br>%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+msgid "Replace recipe?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+msgid "A custom recipe named %s already exists. Do you want to replace it?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:201
+msgid "Pick recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:201
+msgid "Pick the recipe to customize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+msgid "Choose a recipe file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
+msgid "Add custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
+msgid "Available user recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
+msgid "Add/Update &recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
+msgid "&Remove recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
+msgid "&Share recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
+msgid "Customize &builtin recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
+msgid "&Load recipe from file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:256
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Create a basic news "
+"recipe, by adding RSS feeds to it. <br />For most feeds, you will have to "
+"use the \"Advanced mode\" to further customize the fetch "
+"process.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
+msgid "Recipe &title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
+msgid "&Oldest article:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
+msgid "The oldest article to download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
+msgid "&Max. number of articles per feed:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265
+msgid "Maximum number of articles to download per feed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
+msgid "Feeds in recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
+msgid "Remove feed from recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274
+msgid "Add feed to recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
+msgid "&Feed title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
+msgid "Feed &URL:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
+msgid "&Add feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276
+msgid ""
+"For help with writing advanced news recipes, please visit <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
+msgid "Recipe source code (python)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:97
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Set a regular expression "
+"pattern to use when trying to guess ebook metadata from filenames. </p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">A <a "
+"href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+"decoration: underline; color:#0000ff;\">reference</span></a> on the syntax "
+"of regular expressions is available.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" "
+"font-weight:600;\">Test</span> functionality below to test your regular "
+"expression on a few sample filenames. The group names for the various "
+"metadata entries are documented in tooltips.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:104
+msgid "Regular &expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:105
+msgid "&Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
+msgid "File &name:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
+msgid "Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:108
+msgid "Title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:109
+msgid "Regular expression (?P&lt;title&gt;)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
+msgid "No match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111
+msgid "Authors:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112
+msgid "Regular expression (?P<authors>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+msgid "Series:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+msgid "Regular expression (?P<series>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
+msgid "Series index:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
+msgid "Regular expression (?P<series_index>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+msgid "ISBN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+msgid "Regular expression (?P<isbn>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:46
+msgid "Job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:47
+msgid "Status"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:48
+msgid "Progress"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:49
+msgid "Running time"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:65
+msgid "Unknown job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:70
+msgid "Finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:72
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:74
+msgid "Waiting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:76
+msgid "Working"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
+msgid "Cannot kill job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
+msgid "Cannot kill jobs that communicate with the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
+msgid "Job has already run"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
+msgid "Size (MB)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
+msgid "Date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+msgid "Rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+msgid "None"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
+msgid "Book <font face=\"serif\">%s</font> of %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
+msgid "Configure Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
+msgid "Use white background"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
+msgid "Hyphenate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:50
+msgid "<b>Changes will only take effect after a restart.</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:64
+msgid " - LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
+msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
+msgid "No matches found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
+msgid "LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
+msgid "Parsing LRF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
+msgid "LRF Viewer toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
+msgid "Next Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
+msgid "Previous Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+msgid "Back"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+msgid "Forward"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
+msgid "Next match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
+msgid "Open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
+msgid "Configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
+msgid "&Restore"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
+msgid "&Donate to support calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
+msgid ""
+"<p>For help visit <a "
+"href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
+msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+msgid "Save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
+msgid "Set defaults for conversion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
+msgid "Set defaults for conversion of comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
+msgid "Bad database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
+msgid "Choose a location for your ebook library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
+msgid "Browse by covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
+msgid "Device database corrupted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
+msgid ""
+"\n"
+"                <p>The database of books on the reader is corrupted. Try the "
+"following:\n"
+"                <ol>\n"
+"                <li>Unplug the reader. Wait for it to finish regenerating "
+"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+"it should work with %(app)s. If not try the next step.</li>\n"
+"                <li>Quit %(app)s. Find the file media.xml in the reader's "
+"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+"file. Re-connect it and start %(app)s.</li>\n"
+"                </ol>\n"
+"                "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
+msgid "Saving to disk..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
+msgid "Saved"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+msgid ""
+"<p>Could not save the following books to disk, because the %s format is not "
+"available for them:<ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
+msgid "Could not save some ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
+msgid "%s has no available formats."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
+msgid "Cannot configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
+msgid "Cannot configure while there are running jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
+msgid "Copying database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+msgid "Copying library to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
+msgid "Invalid database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+msgid ""
+"<p>An invalid database already exists at %s, delete it before trying to move "
+"the existing database.<br>Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
+msgid "Could not move database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
+msgid "No detailed info available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+msgid "No detailed information is available for books on the device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
+msgid "Conversion Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
+msgid ""
+"<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
+"first remove the DRM using 3rd party tools."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
+msgid "Invalid library location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
+msgid "Could not access %s. Using %s as the library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
+msgid ""
+"is the result of the efforts of many volunteers from all over the world. If "
+"you find it useful, please consider donating to support its development."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
+msgid "There are active jobs. Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
+msgid ""
+" is communicating with the device!<br>\n"
+"                      'Quitting may cause corruption on the device.<br>\n"
+"                      'Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
+msgid "WARNING: Active jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+msgid ""
+"will keep running in the system tray. To close it, choose <b>Quit</b> in the "
+"context menu of the system tray."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
+msgid ""
+"<span style=\"color:red; font-weight:bold\">Latest version: <a "
+"href=\"%s\">%s</a></span>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
+msgid ""
+"%s has been updated to version %s. See the <a "
+"href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
+"Visit the download page?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
+msgid "Use the library located at the specified path."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
+msgid "Start minimized to system tray."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
+msgid "Log debugging information to console"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
+msgid "calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
+msgid ""
+"Set the output format that is used when converting ebooks and downloading "
+"news"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+msgid "Advanced search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+msgid "Alt+S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+msgid "&Search:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+msgid ""
+"Search the list of books by title or author<br><br>Words separated by spaces "
+"are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+msgid ""
+"Search the list of books by title, author, publisher, tags and "
+"comments<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+msgid "Reset Quick Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Sort by &popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Add books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Remove books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
+msgid "Del"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+msgid "Edit meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+msgid "E"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+msgid "Send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+msgid "S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+msgid "Fetch news"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+msgid "F"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+msgid "Convert E-books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+msgid "C"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+msgid "V"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+msgid "Books with the same tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
+msgid "Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+msgid "Configure calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
+msgid "Ctrl+P"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:18
+msgid ""
+"Redirect console output to a dialog window (both stdout and stderr). Useful "
+"on windows where GUI apps do not have a output streams."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:57
+msgid "&Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:58
+msgid "&Quit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:84
+msgid "ERROR: Unhandled exception"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
+msgid "Click to browse books by their covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
+msgid "Click to turn off Cover Browsing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+msgid ""
+"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+"module failed:<br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:167
+msgid "Click to browse books by tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
+msgid "Publishers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:117
+msgid "Convert book: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:151
+msgid "Convert comic: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:267
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:307
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:335
+msgid "Convert book %d of %d (%s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:344
+msgid ""
+"<p>Could not convert %d of %d books, because no suitable source format was "
+"found.<ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:345
+msgid "Could not convert some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:387
+msgid "Fetch news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:384
+msgid "You must set a username and password for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:101
+msgid "Configure Ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:102
+msgid "&Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:103
+msgid "Se&rif family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:104
+msgid "&Sans family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:105
+msgid "&Monospace family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:106
+msgid "&Default font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:108
+msgid "Monospace &font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:110
+msgid "S&tandard font:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:111
+msgid "Serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:112
+msgid "Sans-serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:113
+msgid "Monospace"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:114
+msgid "&User stylesheet"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:50
+msgid "Options to customize the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:86
+msgid ""
+"Set the user CSS stylesheet. This can be used to customize the look of all "
+"books."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
+msgid "Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
+msgid "The serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:63
+msgid "The sans-serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:65
+msgid "The monospaced font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:66
+msgid "The standard font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:67
+msgid "The monospaced font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:68
+msgid "The standard font type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
+msgid "Go to..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
+msgid "Position in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+msgid "/Unknown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
+msgid "Go to a reference. To get reference numbers, use the reference mode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+msgid "Search for text in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
+msgid "Choose ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
+msgid "Ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+msgid "Add bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+msgid "Enter title for bookmark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
+msgid "No matches found for: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
+msgid "Loading flow..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
+msgid "Laying out %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
+msgid "Loading ebook..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
+msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
+msgid "DRM Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
+msgid "Could not open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
+msgid "<b>%s</b><br/><p>%s</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
+msgid "Options to control the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
+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:592
+msgid ""
+"%prog [options] file\n"
+"\n"
+"View an ebook.  \n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+msgid "Ebook Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+msgid "toolBar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+msgid "Next page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+msgid "Previous page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+msgid "Font size larger"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+msgid "Font size smaller"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
+msgid "Find next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
+msgid "Copy to clipboard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
+msgid "Reference Mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
+msgid "Bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+msgid "Invalid regular expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+msgid "Invalid regular expression: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
+msgid ""
+"Reader\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
+msgid ""
+"Card\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
+msgid "Click to see the list of books available on your computer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
+msgid "Click to see the list of books in the main memory of your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+msgid "Click to see the list of books on the storage card in your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
+msgid "Settings to control the calibre content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
+msgid "The port on which to listen. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:22
+msgid "The server timeout in seconds. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
+msgid "The max number of worker threads to use. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:28
+msgid "Username for access. By default, it is: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:107
+msgid ""
+"Path to the calibre library. Default is to use the path stored in the "
+"settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:187
+msgid ""
+"%prog list [options]\n"
+"\n"
+"List the books available in the calibre database.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:195
+msgid ""
+"The fields to display when listing books in the database. Should be a comma "
+"separated list of fields.\n"
+"Available fields: %s\n"
+"Default: %%default. The special field \"all\" can be used to select all "
+"fields. Only has effect in the text output format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:197
+msgid ""
+"The field by which to sort the results.\n"
+"Available fields: %s\n"
+"Default: %%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:199
+msgid "Sort results in ascending order"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:201
+msgid ""
+"Filter the results by the search query. For the format of the search query, "
+"please see the search related documentation in the User Manual. Default is "
+"to do no filtering."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:203
+msgid ""
+"The maximum width of a single line in the output. Defaults to detecting "
+"screen size."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:204
+msgid "The string used to separate fields. Default is a space."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:205
+msgid ""
+"The prefix for all file paths. Default is the absolute path to the library "
+"folder."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:208
+msgid ""
+"The format in which to output the data. Available choices: %s. Defaults is "
+"text."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:216
+msgid "Invalid fields. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:223
+msgid "Invalid sort field. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:294
+msgid ""
+"The following books were not added as they already exist in the database "
+"(see --duplicates option):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:320
+msgid ""
+"%prog add [options] file1 file2 file3 ...\n"
+"\n"
+"Add the specified files as books to the database. You can also specify "
+"directories, see\n"
+"the directory related options below.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
+msgid ""
+"Assume that each directory has only a single logical book and that all files "
+"in it are different e-book formats of that book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:331
+msgid "Process directories recursively"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:333
+msgid ""
+"Add books to database even if they already exist. Comparison is done based "
+"on book titles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:338
+msgid "You must specify at least one file to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:356
+msgid ""
+"%prog remove ids\n"
+"\n"
+"Remove the books identified by ids from the database. ids should be a comma "
+"separated list of id numbers (you can get id numbers by using the list "
+"command). For example, 23,34,57-85\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:368
+msgid "You must specify at least one book to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:388
+msgid ""
+"%prog add_format [options] id ebook_file\n"
+"\n"
+"Add the ebook in ebook_file to the available formats for the logical book "
+"identified by id. You can get id by using the list command. If the format "
+"already exists, it is replaced.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:399
+msgid "You must specify an id and an ebook file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:404
+msgid "ebook file must have an extension"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:412
+msgid ""
+"\n"
+"%prog remove_format [options] id fmt\n"
+"\n"
+"Remove the format fmt from the logical book identified by id. You can get id "
+"by using the list command. fmt should be a file extension like LRF or TXT or "
+"EPUB. If the logical book does not have fmt available, do nothing.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:425
+msgid "You must specify an id and a format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
+msgid ""
+"\n"
+"%prog show_metadata [options] id\n"
+"\n"
+"Show the metadata stored in the calibre database for the book identified by "
+"id.\n"
+"id is an id number from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:451
+msgid "Print metadata in OPF form (XML)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:456
+msgid "You must specify an id"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:470
+msgid ""
+"\n"
+"%prog set_metadata [options] id /path/to/metadata.opf\n"
+"\n"
+"Set the metadata stored in the calibre database for the book identified by "
+"id\n"
+"from the OPF file metadata.opf. id is an id number from the list command. "
+"You\n"
+"can get a quick feel for the OPF format by using the --as-opf switch to the\n"
+"show_metadata command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:483
+msgid "You must specify an id and a metadata file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:495
+msgid ""
+"%prog export [options] ids\n"
+"\n"
+"Export the books specified by ids (a comma separated list) to the "
+"filesystem.\n"
+"The export operation saves all formats of the book, its cover and metadata "
+"(in\n"
+"an opf file). You can get id numbers from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:503
+msgid "Export all books in database, ignoring the list of ids."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:505
+msgid "Export books to the specified directory. Default is"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:507
+msgid "Export all books into a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:509
+msgid "Create file names as author - title instead of title - author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:514
+msgid "You must specify some ids or the %s option"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:524
+msgid ""
+"%%prog command [options] [arguments]\n"
+"\n"
+"%%prog is the command line interface to the calibre books database.\n"
+"\n"
+"command is one of:\n"
+"  %s\n"
+"\n"
+"For help on an individual command: %%prog command --help\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
+msgid "<p>Copying books to %s<br><center>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1252
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1361
+msgid "Copying <b>%s</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1332
+msgid "<p>Migrating old database to ebook library in %s<br><center>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1378
+msgid "Compacting database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server.py:141
+msgid "Password to access your calibre library. Username is "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server.py:401
+msgid ""
+"[options]\n"
+"\n"
+"Start the calibre content server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/parallel.py:388
+msgid "Could not launch worker process."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/parallel.py:814
+msgid "Job stopped by user"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:43
+msgid "%sUsage%s: %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:81
+msgid "Created by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
+msgid "Path to the database in which books are stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+msgid "Pattern to guess metadata from filenames"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:540
+msgid "Access key for isbndb.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:542
+msgid "Default timeout for network operations (seconds)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:544
+msgid "Path to directory in which your library of books is stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:546
+msgid "The language in which to display the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:548
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:550
+msgid "Read metadata from files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:552
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:180
+msgid "Could not initialize the fontconfig library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
+msgid "URL must have the scheme sftp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
+msgid "host must be of the form user@hostname"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
+msgid "Failed to negotiate SSH session: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
+msgid "Failed to authenticate with server: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
+msgid "Unknown feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:145
+msgid "Untitled article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:15
+msgid "Options to control the fetching of periodical content from the web."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:18
+msgid "Customize the download engine"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:460
+msgid ""
+"Timeout in seconds to wait for a response from the server. Default: %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:468
+msgid ""
+"Minimum interval in seconds between consecutive fetches. Default is %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:470
+msgid ""
+"The character encoding for the websites you are trying to download. The "
+"default is to try and guess the encoding."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:472
+msgid ""
+"Only links that match this regular expression will be followed. This option "
+"can be specified multiple times, in which case as long as a link matches any "
+"one regexp, it will be followed. By default all links are followed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+msgid ""
+"Any link that matches this regular expression will be ignored. This option "
+"can be specified multiple times, in which case as long as any regexp matches "
+"a link, it will be ignored.By default, no links are ignored. If both --"
+"filter-regexp and --match-regexp are specified, then --filter-regexp is "
+"applied first."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:476
+msgid "Do not download CSS stylesheets."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:33
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:90
+msgid ""
+"Specify a list of feeds to download. For example: \n"
+"\"['http://feeds.newsweek.com/newsweek/TopNews', "
+"'http://feeds.newsweek.com/headlines/politics']\"\n"
+"If you specify this option, any argument to %prog is ignored and a default "
+"recipe is used to download the feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:37
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:94
+msgid "Be more verbose while processing."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:39
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:96
+msgid ""
+"The title for this recipe. Used as the title for any ebooks created from the "
+"downloaded feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:41
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:97
+msgid "Username for sites that require a login to access content."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:98
+msgid "Password for sites that require a login to access content."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:51
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:101
+msgid ""
+"Number of levels of links to follow on webpages that are linked to from "
+"feeds. Defaul %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:103
+msgid ""
+"The directory in which to store the downloaded feeds. Defaults to the "
+"current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:55
+msgid "Don't show the progress bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:57
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:107
+msgid "Very verbose output, useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:59
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:109
+msgid ""
+"Useful for recipe development. Forces max_articles_per_feed to 2 and "
+"downloads at most 2 feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:63
+msgid ""
+"%%prog [options] ARG\n"
+"\n"
+"%%prog parses an online source of articles, like an RSS or ATOM feed and \n"
+"fetches the article contents organized in a nice hierarchy.\n"
+"\n"
+"ARG can be one of:\n"
+"\n"
+"file name            - %%prog will try to load a recipe from the file\n"
+"\n"
+"builtin recipe title - %%prog will load the builtin recipe and use it to "
+"fetch the feed. For e.g. Newsweek or \"The BBC\" or \"The New York Times\"\n"
+"\n"
+"recipe as a string   - %%prog will load the recipe directly from the string "
+"arg.\n"
+"\n"
+"Available builtin recipes are:\n"
+"%s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:87
+msgid ""
+"Options to control web2disk (used to fetch websites linked from feeds)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:105
+msgid "Dont show the progress bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:120
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:684
+msgid "Fetching feeds..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
+msgid "Unknown News Source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:563
+msgid "Download finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+msgid "Failed to download the following articles:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:567
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:573
+msgid " from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:571
+msgid "Failed to download parts of the following articles:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:575
+msgid "\tFailed links:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:663
+msgid "Could not fetch article. Run with --debug to see the reason"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:688
+msgid "Got feeds from index page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:694
+msgid "Trying to download cover..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+msgid "Starting download [%d thread(s)]..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:763
+msgid "Feeds downloaded to %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+msgid "Could not download cover: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:780
+msgid "Downloading cover from %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:913
+msgid "Untitled Article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:968
+msgid ""
+"\n"
+"Downloaded article %s from %s\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:974
+msgid "Article downloaded: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:980
+msgid "Failed to download article: %s from %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
+msgid "Article download failed: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
+msgid "Fetching feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_atlantic.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_barrons.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_bbc.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_business_week.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chicago_tribune.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_chr_mon.py:11
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cnn.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_common_dreams.py:8
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_daily_mail.py:6
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_discover_magazine.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dna.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ecogeek.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_economist.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_endgadget.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_espn.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_exiled.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_financial_times.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_forbes.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_freakonomics.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_fudzilla.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glasgow_herald.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_guardian.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_harpers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_harpers_full.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_iht.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_indy_star.py:6
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_irish_times.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_japan_times.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jpost.py:8
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py:44
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_latimes.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linux_magazine.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_linuxdevices.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lrb.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_news_times.py:7
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_newsweek.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm_int.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nytimes.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_outlook_india.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_physics_today.py:11
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_physics_world.py:8
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politico.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_portfolio.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_reuters.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_science_aas.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_science_news.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sciencedaily.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_scientific_american.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_security_watch.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_shacknews.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_smh.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_soldiers.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegel_int.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py:20
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_starbulletin.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_teleread.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_age.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_nation.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_oz.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_register.py:6
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_the_scotsman.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_themarketticker.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_theonion.py:20
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_time_magazine.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_times_online.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_upi.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_usatoday.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_utne.py:20
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wash_post.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wikinews_en.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_winsupersite.py:10
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wired.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_wsj.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_xkcd.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zdnet.py:17
+msgid "English"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
+msgid "French"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_de_standaard.py:12
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_demorgen_be.py:16
+msgid "Dutch"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
+msgid "Portugese"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_faznet.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
+msgid "German"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:12
+msgid "Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
+msgid "Italian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:83
+msgid "Skipping duplicated article: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:88
+msgid "Skipping filtered article: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
+msgid ""
+"%prog URL\n"
+"\n"
+"Where URL is for example http://google.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+msgid "Base directory into which URL is saved. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:463
+msgid ""
+"Maximum number of levels to recurse i.e. depth of links to follow. Default "
+"%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:466
+msgid ""
+"The maximum number of files to download. This only applies to files from <a "
+"href> tags. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+msgid "Show detailed output information. Useful for debugging"
+msgstr ""
diff --git a/src/calibre/translations/nb.po b/src/calibre/translations/nb.po
index fe2a7b69bf..75eb01b952 100644
--- a/src/calibre/translations/nb.po
+++ b/src/calibre/translations/nb.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-01-07 18:22+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-24 15:00+0000\n"
+"Last-Translator: Kenneth Langdalen <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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -106,7 +113,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
 msgid "File type"
-msgstr ""
+msgstr "Filtype"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
 msgid "Metadata reader"
@@ -134,27 +141,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -218,17 +226,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Lesebrettet har ikke et lagringskort tilknyttet seg."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -508,7 +516,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -519,14 +527,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -545,88 +553,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -647,7 +655,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [opsjoner] LITFIL"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Lagringskatalog. Standard er nåværende katalog"
 
@@ -664,7 +672,7 @@ msgid "Useful for debugging."
 msgstr "Praktisk for feilsøking."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB bok opprettet i"
 
@@ -705,9 +713,9 @@ msgid "Sort key for the author"
 msgstr "Sorteringsnøkkel for forfatter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Forlag"
 
@@ -1554,63 +1562,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
-msgid "Title"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+msgid "Title"
+msgstr "Tittel"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
-msgstr ""
+msgstr "Kommentarer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
-msgstr ""
+msgstr "Språk"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1726,7 +1734,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1742,11 +1750,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1857,7 +1865,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:833
 msgid "Foreword"
-msgstr ""
+msgstr "Forord"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:834
 msgid "List of Illustrations"
@@ -1913,97 +1921,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -2040,7 +2052,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -2048,43 +2060,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
-msgstr ""
+msgstr "Slett bøker fra enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
+msgstr "Last ned bøker fra enhet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
+msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
-msgid "View book on device"
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -2093,11 +2245,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
-msgstr ""
+msgstr "Formater"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
@@ -2123,11 +2276,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
 msgid "&Next"
-msgstr ""
+msgstr "&Neste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
-msgstr ""
+msgstr "Velg format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
@@ -2139,7 +2292,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
-msgstr ""
+msgstr "&Tittel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
@@ -2153,7 +2306,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:502
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:540
 msgid "&Profile:"
-msgstr ""
+msgstr "&Profil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 msgid "Disable &normalize"
@@ -2191,143 +2344,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2345,211 +2547,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
-msgstr ""
+msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Passord:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
-msgstr ""
+msgstr "&Start server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
-msgstr ""
+msgstr "St&op server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
-msgstr ""
+msgstr "&Test server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2558,39 +2861,39 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
-msgstr ""
+msgstr "Er du sikker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
@@ -2612,7 +2915,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2666,26 +2969,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2695,7 +2998,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2756,7 +3059,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:501
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:330
 msgid "&Title: "
-msgstr ""
+msgstr "&Tittel: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:474
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:502
@@ -2850,7 +3153,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:516
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
 msgid "Book "
-msgstr ""
+msgstr "Bok "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:490
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:524
@@ -3016,47 +3319,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
+msgstr "ISBN"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr "Advarsel"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3375,58 +3684,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3448,7 +3775,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
 msgid "IS&BN:"
-msgstr ""
+msgstr "IS&BN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
 msgid "&Fetch metadata from server"
@@ -3485,7 +3812,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 msgid "Change &password"
-msgstr ""
+msgstr "Bytt &passord"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
 msgid "Password needed"
@@ -3493,7 +3820,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:43
 msgid "Aborting..."
-msgstr ""
+msgstr "Avbryter..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:40
 msgid "You"
@@ -3506,84 +3833,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
-msgstr ""
+msgstr "Søk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
-msgstr ""
+msgstr "Mandag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
-msgstr ""
+msgstr "Tirsdag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
-msgstr ""
+msgstr "Onsdag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
-msgstr ""
+msgstr "dag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
-msgstr ""
+msgstr "Fredag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
-msgstr ""
+msgstr "Lørdag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
-msgstr ""
+msgstr "Søndag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
-msgstr ""
+msgstr "Torsdag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3627,7 +3955,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
 msgid " days"
-msgstr ""
+msgstr " dager"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:172
 msgid "&Account"
@@ -3958,19 +4286,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:105
 msgid "&Test"
-msgstr ""
+msgstr "&Test"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
 msgid "File &name:"
-msgstr ""
+msgstr "Fil&navn:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:108
 msgid "Title:"
-msgstr ""
+msgstr "Tittel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:109
 msgid "Regular expression (?P&lt;title&gt;)"
@@ -3981,11 +4309,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -4015,7 +4343,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
 msgid "ISBN:"
-msgstr ""
+msgstr "ISBN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Regular expression (?P<isbn>)"
@@ -4027,7 +4355,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:47
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:48
 msgid "Progress"
@@ -4047,11 +4375,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:72
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:74
 msgid "Waiting"
-msgstr ""
+msgstr "Venter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:76
 msgid "Working"
@@ -4070,45 +4398,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
-msgid "Date"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
+msgid "Date"
+msgstr "Dato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -4137,7 +4469,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4155,11 +4487,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
 msgid "Next Page"
-msgstr ""
+msgstr "Neste side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
 msgid "Previous Page"
-msgstr ""
+msgstr "Forrige side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
@@ -4184,148 +4516,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4341,436 +4654,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
-msgstr ""
+msgstr "Bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
-msgstr ""
+msgstr "HTML-bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
-msgstr ""
+msgstr "PDF-bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
-msgstr ""
+msgstr "Lagret"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
-msgstr ""
+msgstr "Kopierer database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Oppdatering tilgjengelig"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
-msgstr ""
+msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
-msgstr ""
+msgstr "&Søk:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4956,84 +5234,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
-msgstr ""
+msgstr "Gå til..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
-msgstr ""
+msgstr "/Ukjent"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
-msgstr ""
+msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5050,11 +5328,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
-msgstr ""
+msgstr "Neste side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
-msgstr ""
+msgstr "Forrige side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
@@ -5066,11 +5344,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
-msgstr ""
+msgstr "Finn neste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Kopier til utklippstavle"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
@@ -5084,44 +5362,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5387,7 +5665,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1252
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1361
 msgid "Copying <b>%s</b>"
-msgstr ""
+msgstr "Kopierer <b>%s</b>"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1332
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
@@ -5480,6 +5758,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5645,7 +5927,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:563
 msgid "Download finished"
-msgstr ""
+msgstr "Nedlasting ferdig"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
 msgid "Failed to download the following articles:"
@@ -5654,7 +5936,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:567
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:573
 msgid " from "
-msgstr ""
+msgstr " fra "
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:571
 msgid "Failed to download parts of the following articles:"
@@ -5717,34 +5999,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Kroatisk"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Serbisk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5792,7 +6081,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5842,65 +6131,73 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_xkcd.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zdnet.py:17
 msgid "English"
-msgstr ""
+msgstr "Engelsk"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Spansk"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
-msgstr ""
+msgstr "Fransk"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_de_standaard.py:12
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_demorgen_be.py:16
 msgid "Dutch"
+msgstr "Nederlandsk"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
 msgid "Portugese"
-msgstr ""
+msgstr "Portugisisk"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_faznet.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
 msgid "German"
-msgstr ""
+msgstr "Tysk"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:12
 msgid "Kovid Goyal"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
+msgstr "Kovid Goyal"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
-msgstr ""
+msgstr "Italiensk"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:83
 msgid "Skipping duplicated article: %s"
diff --git a/src/calibre/translations/nds.po b/src/calibre/translations/nds.po
index 533e24ee83..30aff4226b 100644
--- a/src/calibre/translations/nds.po
+++ b/src/calibre/translations/nds.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-03-15 20:36+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-26 07:39+0000\n"
 "Last-Translator: S. Dorscht <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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -23,13 +23,14 @@ msgid "Does absolutely nothing"
 msgstr "Macht gar nix"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -46,21 +47,23 @@ msgstr "Macht gar nix"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -68,21 +71,25 @@ msgstr "Macht gar nix"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -138,27 +145,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Metadaten aus %s Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Umschlagbild aus Comic Dateien extrahieren"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Metadaten aus Büchern in ZIP Archiven lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Metadaten von eBooks in RAR Archiven lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Geben Sie die Metadaten in %s Dateien an"
 
@@ -232,17 +240,17 @@ msgstr "Gewähltes Plugin ausschalten"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Im Reader ist keine Speicherkarte eingesteckt."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Nicht genügend freier Speicherplatz auf der Speicherkarte"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Nicht genügend freier Spreicherplatz im Hauptspeicher"
 
@@ -575,7 +583,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "Konnte kein eBook im Archiv finden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -593,14 +601,14 @@ msgstr ""
 "Verknüpfungen aus dem\n"
 "<spine> Element der OPF Datei verwendet.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Ausgabe geschrieben nach "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Geben Sie eine Eingabedatei im HTML Format an."
 
@@ -623,26 +631,26 @@ msgstr ""
 "\t\tZu viel Textauszeichnung. Wieder-Aufteilung ohne Bewahrung der Struktur. "
 "Dies kann zu falschem Rendering führen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Verarbeitetes HTML wurde geschrieben in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Einstellungen zur Kontrolle der Durchforstung von HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist das aktuelle Verzeichnis."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Zeichenkodierung für HTML Dateien. Die Voreinstellung ist automatisches "
 "Erkennen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -650,11 +658,11 @@ msgstr ""
 "Erstellt die Ausgabe in eine ZIP Datei. Wird diese Option angegeben, sollte -"
 "-output der Name einer Datei und nicht eines Verzeichnisses sein."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Kontrolliert die Verfolgung von Verknüpfungen in HTML Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -662,7 +670,7 @@ msgstr ""
 "Durchforstet Verknüpfungen in HTML Dateien zuerst in die Breite. "
 "Normalerweise werden sie zuerst in die Tiefe durchforstet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -671,39 +679,39 @@ msgstr ""
 "Dateien. Darf nicht negativ sein. 0 gibt an, dass keine Verknüpfungen in der "
 "ursprünglichen HTML Datei verfolgt werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Geben Sie die Metadaten des erstellten eBooks an"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Geben Sie den Titel an. Voreinstellung ist automatische Ermittlung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "Autor(en) des eBooks, als eine durch & getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Das Thema dieses Buches, als durch Kommata getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Geben Sie den Herausgeber dieses Buches an."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Inhaltsübersicht dieses Buches."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Metadaten aus der angegebenen OPF Datei laden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Hilfreiche Einstellungen zur Fehlersuche"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -711,13 +719,13 @@ msgstr ""
 "Noch ausführlicher bei der weiteren Verarbeitung vorgehen. Kann zur "
 "Vergrößerung der Ausführlichkeit mehrfach angegeben werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Ausgabe HTML ist \"hübsch gedruckt\" zur einfacheren Analyse durch "
 "menschliche Wesen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -747,7 +755,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist aktuelles Verzeichnis."
 
@@ -764,7 +772,7 @@ msgid "Useful for debugging."
 msgstr "Hilfreich bei der Fehlersuche."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB eBook erstellt in"
 
@@ -807,9 +815,9 @@ msgid "Sort key for the author"
 msgstr "Sortierung nach Autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Herausgeber"
 
@@ -1727,63 +1735,63 @@ msgstr "Gebe Autoren ein"
 msgid "Set the comment"
 msgstr "Gebe Kommentar ein"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Produzent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Bemerkung"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Etiketten"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
@@ -1919,7 +1927,7 @@ msgstr "Geben Sie die Sprache an"
 msgid "Set the ISBN"
 msgstr "Geben Sie sie ISBN an"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Geben Sie das Feld dc:language an"
 
@@ -1935,11 +1943,11 @@ msgstr "Benutzung: rb-meta file.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "Erstelle Mobipocket Datei aus EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] dateiname.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "Original MOBI HTML gespeichert in"
 
@@ -2123,93 +2131,93 @@ msgstr ""
 "\tBeschneidet ein pdf. \n"
 "\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Häufig benutzte Verzeichnisse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 "Das zu verwendende Format bei der Speicherung einzelner Dateie auf die "
 "Festplatte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Bestätigung vor dem Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Schaltflächengröße der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Zeige Schaltflächenbeschriftung in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Aufteilung des Hauptfensters"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Benutze römische Ziffern für Seriennummerierung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Liste der Etiketten nach Beliebtheit sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Voreinstellungen für Konvertierung zu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Optionen für den LRF eBook Viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 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:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "Älteste in der Datenbank gespeicherte Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Symbol im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Geladene Nachrichten auf das Gerät übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 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:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -2217,11 +2225,17 @@ msgstr ""
 "Zeige Cover-Ansicht in einem eigenen Fenster anstatt im Hauptfenster von "
 "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+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/add.py:87
 msgid "Added %s to library"
 msgstr "%s zur Bibliothek hinzugefügt"
@@ -2260,7 +2274,7 @@ msgid "Adding books to database..."
 msgstr "Füge Bücher zur Datenbank hinzu..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "Lese Metadaten..."
 
@@ -2268,43 +2282,189 @@ msgstr "Lese Metadaten..."
 msgid "Searching in"
 msgstr "Suche in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Gerät ist nicht mehr verbunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Geräteinformationen erstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Liste der Bücher auf dem Gerät erstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Metadaten zum Gerät senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "%d Bücher auf das Gerät laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Bücher vom Gerät löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Bücher vom Gerät herunterladen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Buch auf dem Gerät ansehen"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "und aus der Datenbank löschen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr "Geben Sie die voreingestellte Übertragungsart an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr "eMail an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "An Hauptspeicher senden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "An Speicherkarte senden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr "Gewähltes Format an Hauptspeicher übertragen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr "Gewähltes Format an Speicherkarte übertragen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr "Keine Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr "ausgewählt zum Versenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+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:412
+msgid "No device"
+msgstr "Kein Gerät"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr "Übertragung schlug fehl: Kein Gerät verbunden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr "Keine Speicherkarte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+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:449
+msgid "E-book:"
+msgstr "eBook:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr "Im Anhang finden Sie das eBook"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "von"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr "im %s Format."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr "Sende eMail an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Keine geeigneten Formate"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+"Konnte die folgenden Bücher nicht versenden, da keine passenden Formate "
+"vorhanden:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr "Senden der Bücher schlug fehl"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr "Senden der folgenden Bücher schlug fehl:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr "Per eMail versendet:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr "Nachrichten:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr "Im Anhang ist"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr "Nachrichten senden an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Sende Nachrichten an das Gerät."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Sende Bücher an das Gerät."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Die folgenden Bücher konnten nicht auf das Gerät geladen werden, da keine "
+"geeigneten Formate vorhanden sind:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Gerätespeicher voll"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Es können keine Bücher mehr auf das Gerät geladen werden, da der "
+"Gerätespeicher voll ist "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pfad"
@@ -2313,7 +2473,8 @@ msgstr "Pfad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2412,27 +2573,31 @@ msgstr "&Weite"
 msgid "Disable &Trimming"
 msgstr "Beschneiden ausschal&ten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "von"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
+"eMail\n"
+"Versand"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Allgemein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
-msgstr "Schnittstelle"
+msgstr "Bedienungsoberfläche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2440,105 +2605,158 @@ msgstr ""
 "Content\n"
 "Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr "Automatisches Versenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr "eMail"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+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/dialogs/config.py:150
+msgid ""
+"If checked, downloaded news will be automatically mailed <br>to this email "
+"address (provided it is in one of the listed formats)."
+msgstr ""
+"Wenn ausgefüllt, werden geladene Nachrichten automatisch <br>an diese eMail "
+"Adresse versendet (vorausgesetzt sie entspricht einem der angegebenen "
+"Formate)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:224
+msgid "new email address"
+msgstr "Neue eMail Adresse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr "Googlemail Setup abschließen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+"Vergessen Sie nicht, Ihren Googlemail Benutzernamen und Ihr Passwort "
+"anzugeben"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr "Schlechte Einstellung"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr "Sie müssen die Absender eMail Adresse angeben"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+"Sie müssen den Benutzernamen und das Passwort für den Mailserver angeben."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Kein gültiger Plugin Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s ist kein gültiger Plugin Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Plugin wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "Plugin kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "Das Plugin: %s kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Plugin nicht anpassbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "Plugin: %s bedarf keines Anpassens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Anpassen von %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "Kann festinstalliertes Plugin nicht entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " kann nicht entfernt werden, da es ein festinstalliertes Plugin ist. "
 "Versuchen Sie, es auszuschalten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Fehler Log:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Zugriffs-Protokolldatei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Content Server konnte nicht gestartet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr "Ort der Datenbank wählen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Ungültige Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 "Die Größe %s ist ungültig. Sie muss der Form BreitexHöhe entsprechen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Ortsangabe der Datenbank ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Muss ein Verzeichnis sein."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Ortsangabe der Datenbank ungültig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Muss ein Verzeichnis sein."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ortsangabe der Datenbank ungültig.<br>Speichern nicht möglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Komprimiere Datenbank. Das kann etwas dauern..."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Komprimiere Datenbank..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Komprimiere Datenbank. Das kann etwas dauern..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2547,16 +2765,16 @@ msgstr ""
 "sortiert gespeichert und die Metadaten werden in der Datei metadata.db "
 "gespeichert)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Zu einem neuen Ort der Datenbank wechseln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2574,18 +2792,18 @@ msgstr "Zu einem neuen Ort der Datenbank wechseln"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Benachrichtigung anzeigen, wenn &neue Version verfügbar ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
@@ -2593,19 +2811,19 @@ msgstr ""
 "Falls Sie diese Einstellung ausschalten, werden die Metadaten aus dem "
 "Dateinamen erschlossen. Dies kann unter Erweitert konfiguriert werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "&Metadaten aus Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Format zur &Speicherung einer Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "Voreinstellung für Zei&tüberschreitung bei Netzwerkverbindungen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2613,117 +2831,241 @@ msgstr ""
 "Voreinstellung der Zeitüberschreitung für Netzwerkabrufe festsetzen (Gilt "
 "immer dann, wenn aus dem Internet Informationen abgerufen werden sollen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " Sekunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wäh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Hoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Niedrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "Auftrags&priorität:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis zur Liste der häufig genutzten Verzeichnisse hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis von der Liste der häufig genutzten Verzeichnisse entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "&Römische Ziffern für Serien Nummerierung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Symbol im Sys&tembereich der Kontrollleiste aktivieren (erfordert Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr "Be&nachrichtigungen im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Zeige Cover-Ansicht in einem eigenen Fenster (Benötigt einen Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Geladene &Nachrichten automatisch an das Gerät senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "Nachrichten nach dem Senden an das Gerät aus der Bibliothek &löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "A&nzahl der anzuzeigenden Umschlagbilder in der Cover-Ansicht (Neustart "
 "erforderlich):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Groß"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Größe der Schaltflächen in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Zeige &Text in Schaltflächen der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Si&chtbare Spalten in Bibliothek-Ansicht wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Internen &Viewer verwenden für:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+"calibre kann Ihre Bücher an Sie (oder Ihr Lesegerät) per eMail versenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr "eMail senden &von:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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>Dies steht im \"Von\" Feld (Absender) von mit calibre versendeten "
+"eMails.<br> Geben Sie Ihre eMail Adresse an"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr "Eine eMail Adresse hinzufügen, an die die Bücher gesendet werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr "eM&ail hinzufügen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr "Als Voreinstellung verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr "eMail entfe&rnen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+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>Ein Mailserver ist nützlich, wenn der Diensteanbieter, an den Sie die "
+"eMail senden, nur eMails von bekannten eMail-Diensteanbietern annimmt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr "Mail&server"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+"calibre kann <b>wahlweise</b> einen Server zum Versenden von Nachrichten "
+"verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr "&Hostname:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr "Der Hostname Ihres Mailservers. Z.B. smtp.gmail.com"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr "&Port:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+"Der Anschluss (Port) auf dem Ihr Mailserver auf Verbindungen wartet. "
+"Voreinstellung ist 25"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "Ben&utzername:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr "Ihr Benutzername auf dem Mailserver"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Passwort:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr "Ihr Passwort auf dem Mailserver"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr "&Zeige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr "V&erschlüsselung:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+"TLS Verschlüsselung für die Verbindung zum Mailserver verwenden. Dies trifft "
+"meistens zu."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr "&TLS"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr "SSL Verschlüsselung für die Verbindung zum Mailserver verwenden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr "&SSL"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr "Googlemail verwenden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Freier unbenutzter Festplattenspeicher der Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "Datenbank &komprimieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadaten aus dem Dateinamen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2733,23 +3075,11 @@ msgstr ""
 "von überall aus mit Hilfe eines Browsers auf Ihre Büchersammlung zugreifen "
 "können. Einstellungsänderungen erfolgen erst nach einem Neustart des Servers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "Server &Port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "Ben&utzername:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Passwort:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2757,13 +3087,13 @@ msgstr ""
 "Wenn Sie das Kennwort leer lassen, kann jeder auf Ihre Büchersammlung über "
 "das Webinterface zugreifen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "Pa&sswort anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2771,31 +3101,31 @@ msgstr ""
 "Maximale Größe (BreitexHöhe) der angezeigten Umschlagbilder. Größere "
 "Umschlagbilder werden verkleinert. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Maximale Ums&chlagbild-Größe:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "Server &starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "Server st&oppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "Server &testen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "Server &automatisch beim Starten hochfahren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Server Logs ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2809,7 +3139,7 @@ msgstr ""
 "auf Ihrem iPhone hinzufügen. In diesem Fall sollte meinservername der volle "
 "Hostname oder die IP Adresse dieses Rechners sein."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -2817,27 +3147,27 @@ msgstr ""
 "Hier können Sie das Verhalten von Calibrie anpassen, indem sie festlegen, "
 "welche Plugins verwendet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr "Plugin &ein-/ausschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "Plugin &anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "Plugin entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "Neues Plugin hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Plugin Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Hinzufügen"
 
@@ -2865,7 +3195,7 @@ msgstr "Konvertiere %s in "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadaten"
@@ -2925,26 +3255,26 @@ msgstr "Wählen Sie das Umschlagbild für "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Lesen nicht möglich"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Sie haben nicht die nötigen Rechte, um diese Datei zu lesen: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Es trat ein Fehler beim Lesen dieser Datei auf: <br /><b>"
 
@@ -2954,7 +3284,7 @@ msgid " is not a valid picture"
 msgstr " ist kein gültiges Bild"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
@@ -3298,55 +3628,62 @@ msgstr "&Titel des erstellten Inhaltsverzeichnisses"
 msgid "Level &3 TOC"
 msgstr "Ebene &3 Inhaltsverzeichnis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Sortierung nach Autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Verbindung nicht möglich"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr "Finde Metadaten..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr "Konnte Metadaten nicht finden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
-"Sie müssen einen gültigen Zugangsschlüssel (access key) für isbndb.com "
-"angeben"
+"Der Download der Metadaten scheint zum Stillstand gekommen zu sein. "
+"Versuchen Sie es später erneut."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Fehler beim Abrufen der Metadaten"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr "Warnung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr "Konnte Metadaten nicht abrufen von:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Keine Metadaten gefunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Keine Metadaten gefunden, versuchen Sie, den Titel und den Autor oder die "
 "ISBN anzupassen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Metadaten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Metadaten abrufen für <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Kostenloses Konto anmelden bei <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> um einen Zugriffsschlüssel zu "
-"erhalten."
+"<p>calibre kann Metadaten für Bücher von zwei Orten abrufen: <b>Google "
+"Books</b> und <b>isbndb.com</b>. <p>Wenn Sie isbndb.com verwenden möchten, "
+"müssen Sie einen <a href=\"http://www.isbndb.com\">kostenfreien Account</a> "
+"anlegen und den Zugangsschlüssel unten angeben."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3691,33 +4028,33 @@ msgstr "&Format entfernen:"
 msgid "A&utomatically set author sort"
 msgstr "Automatisch Sortierung nach Autor setzen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr "Kein Format gewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr "Konnte Metadaten nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr "Konnte Metadaten des Formats %s nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr "Konnte Umschlagbild nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr "Konnte Umschlagbild des Formats %s nicht lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr "Das Umschlagbild im Format %s ist ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3727,26 +4064,44 @@ msgstr ""
 "<b>LibraryThing.com</b> an. <br/>Insofern Sie dies nicht besitzen, können "
 "Sie sich kostenlos <a href='http://www.librarything.com'>anmelden</a>! </p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
-msgstr "Falsches Umschlagbild"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr "Lade Umschlagbild..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr "Das Umschlagbild ist kein gültiges Bild"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Kann kein Umschlagbild abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Sie müssen die ISBN für dieses Buch angeben."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Konnte kein Umschlagbild abrufen.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Sie müssen die ISBN für dieses Buch angeben."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr "Der Download timed out."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr "Falsches Umschlagbild"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr "Das Umschlagbild ist kein gültiges Bild"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr "Konnte Metadaten nicht abrufen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr "Sie müssen wenigstens ISBN, Titel, Autor oder Herausgeber angeben"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3828,84 +4183,85 @@ msgstr "Angepasst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr "Geplant"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d Downloadschemata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr "Montag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr "Tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr "Freitag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr "Samstag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr "Account-Informationen müssen angegeben werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr "Dieses Schema erfordert einen Benutzernamen und ein Kennwort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Erstellt von: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr "Vor %d Tagen, %d Stunden und %d Minuten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr "Zuletzt geladen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Zuletzt geladen: niemals"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Zeitgesteuerter Nachrichten Download"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Neue individuelle Nachrichtenquelle hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4357,11 +4713,11 @@ msgstr "Regulärer Ausdruck (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Kein Treffer"
 
@@ -4446,35 +4802,35 @@ msgstr "Kann Aufträge, die mit dem Gerät kommunizieren, nicht abbrechen"
 msgid "Job has already run"
 msgstr "Auftrag wird schon ausgeführt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Größe (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Bewertung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Keine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Buch <font face=\"serif\">%s</font> von %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "Das ist nicht gestattet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -4482,11 +4838,15 @@ msgstr ""
 "Direktes Hinzufügen auf das Gerät wird nicht unterstützt. Fügen Sie das Buch "
 "zuerst zur Bibliothek hinzu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Suche (Zur erweiterten Suche die Schaltfläche links klicken)"
 
@@ -4515,7 +4875,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Keine Treffer</b> für die Suchworte <i>%s</i> gefunden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -4562,23 +4922,23 @@ msgstr "eBook öffnen"
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Fehler bei der Kommunikation mit dem Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr "Spen&den Sie, um calibre zu unterstützen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Neustart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4586,42 +4946,23 @@ msgstr ""
 "<p>Hilfe gibt es online bei <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s von <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "An Hauptspeicher senden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "An Speicherkarte senden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "und aus der Datenbank löschen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Auf die Speicherkarte senden (Voreinstellung)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Metadaten einzeln bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Metadaten auf einmal bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Bücher aus einem einzelnen Verzeichnis hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -4630,7 +4971,7 @@ msgstr ""
 "Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
 "verschiedenen Formaten)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -4638,79 +4979,79 @@ msgstr ""
 "Bücher aus Verzeichnissen hinzufügen, inklusive Unterverzeichnissen "
 "(verschiedene Bücher im Verzeichnis, jede eBook Datei ist ein anderes Buch)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Nur das %s Format auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Vorschau"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Spezielles Format ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Einzeln konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Voreinstellung für Konvertierung eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Voreinstellungen für die Konvertierung von Comics eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Ähnliche Bücher..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Schlechter Datenbank Standort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Wählen Sie einen Speicherort für Ihre eBook Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr "Umschlagbilder durchsuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Gerät: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Angeschlossen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Gerätedatenbank ist beschädigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4741,67 +5082,56 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Lade Bücher auf das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "EPUB Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "LRF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "HTML Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "LIT Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "MOBI Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Text Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "PDF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Archive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr "Füge Bücher hinzu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Gerätespeicher voll"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>Es können keine Bücher mehr auf das Gerät geladen werden, da der "
-"Gerätespeicher voll ist "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -4809,63 +5139,39 @@ msgstr ""
 "Die gewählten Bücher werden <b>dauerhaft gelöscht</b> und die Dateien vom "
 "Computer entfernt. Sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Lösche Bücher vom Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Keine Bücher ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Sende Nachrichten an das Gerät."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr "Format wählen, das ans Gerät geschickt wird"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Sende Bücher an das Gerät."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Keine geeigneten Formate"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"Die folgenden Bücher konnten nicht auf das Gerät geladen werden, da keine "
-"geeigneten Formate vorhanden sind:<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Speichern auf Festplatte nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr "Speichere auf Festplatte..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Zielverzeichnis auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4873,64 +5179,64 @@ msgstr ""
 "<p>Die folgenden Bücher konnten nicht auf die Festplatte gespeichert werden, "
 "da das %s Format für sie nicht verfügbar ist:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Konnte einige eBooks nicht speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr " abgerufen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Kein Buch ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Ansehen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Format zur Vorschau wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "Konnte Verzeichnis nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s hat keine verfügbaren Formate."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Konfiguration nicht möglich während Aufträge abgearbeitet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Kopiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopiere Bibliothek nach "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Ungültige Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4938,24 +5244,24 @@ msgstr ""
 "<p>Es existiert bereits eine ungültige Datenbank in %s, bitte löschen Sie "
 "diese, bevor sie die bestehende Datenbank verschieben.<br>Fehler: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Konnte Datenbank nicht verschieben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
-msgstr "Es ist keine weitere Information verfügbar"
+msgstr "Es sind keine genaueren Informationen verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Es sind keine weitere Informationen über Bücher auf dem Gerät verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4963,13 +5269,13 @@ msgstr ""
 "Es trat ein Fehler in der Kommunikation mit dem Gerät auf. Bitte entfernen "
 "und schließen Sie das Gerät wieder an und - oder starten Sie neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4978,15 +5284,15 @@ msgstr ""
 "href=\"%s\">DRM</a> geschützt. Sie müssen zunächst das DRM mit einem anderen "
 "Programm entfernen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr "Ungültiger Ort der Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr "Konnte nicht auf %s zugreifen. Verwende %s als Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4995,12 +5301,12 @@ msgstr ""
 "Falls Sie es nützlich finden, sollten Sie eine Spende zur Unterstützung "
 "seiner Entwicklung in Betracht ziehen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Es bestehen aktive Aufträge. Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
@@ -5010,11 +5316,11 @@ msgstr ""
 "                      'Das Beenden könnte das Gerät beschädigen.<br>\n"
 "                      'Wirklich beenden?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive Aufträge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5022,7 +5328,7 @@ msgstr ""
 "wird im System Tray weiter laufen. Zum Schließen wählen Sie <b>Beenden</b> "
 "im Kontextmenü des System Tray."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5030,7 +5336,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Neue Version verfügbar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5040,31 +5350,27 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">neuen Features</a> an. "
 "Möchten Sie die Download Seite besuchen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Neue Version verfügbar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr "Die im angegebenen Pfad sich befindende Bibliothek verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr "Minimiert im Systembereich der Kontrollleiste starten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr "Informationen zur Fehlersuche in Konsole aufzeichnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "Ausgabe:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
@@ -5072,19 +5378,19 @@ msgstr ""
 "Geben Sie das Ausgabeformat an, das zur Konvertierung von eBooks und "
 "geladener Nachrichten verwendet wird"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Suche:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -5092,7 +5398,7 @@ msgstr ""
 "Liste der Bücher nach Titel oder Autor durchsuchen<br><br>Durch Leerzeichen "
 "getrennte Wörter werden mit \"UND\" verknüpft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -5101,113 +5407,109 @@ msgstr ""
 "durchsuchen<br><br>Durch Leerzeichen getrennte Wörter werden mit \"UND\" "
 "verknüpft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Quick Search löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Übereinstimmung mit irgendeinem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Übereinstimmung mit allen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Nach Beliebtheit sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Bücher hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Bücher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Meta-Informationen editieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "An Reader übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "In eBooks umwandeln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr "Öffne Speicherort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr "Zeige Buchdetails"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Bücher desselben Autors"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Bücher dieser Serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr "Bücher dieses Herausgebers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Bücher mit denselben Etiketten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr "Spezielles Format an das Gerät senden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Voreinstellungen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr "Calibre konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
@@ -5402,88 +5704,88 @@ msgstr "Nichtproportionale Schriftgröße in Punkt"
 msgid "The standard font type"
 msgstr "Standardschriftart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Gehe zu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Stelle im Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 "Zu einem Verweis gehen. Um die Verweisnummern zu erhalten, Verweismodus "
 "verwenden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Suche nach Text im Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "eBook wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Titel für Lesezeichen eingeben:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr "Keine Treffer gefunden für: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "Lade Ablauf..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr "Lege %s an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "Lade eBook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Dieses Buch ist geschützt durch <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "DRM Fehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "Konnte eBook nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr "Einstellungen zur Kontrolle des eBook Viewers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5537,15 +5839,15 @@ msgstr "Lesezeichen"
 msgid "Toggle full screen"
 msgstr "Vollbildmodus beenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Ungültiger regulärer Ausdruck"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Ungültiger regulärer Ausdruck: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5555,7 +5857,7 @@ msgstr ""
 "%d\n"
 "Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
@@ -5565,7 +5867,7 @@ msgstr ""
 "%s\n"
 "verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
@@ -5575,15 +5877,15 @@ msgstr ""
 "%s\n"
 "verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Liste der auf dem Computer vorhandenen Bücher anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr "Liste der im Hauptspeicher des Geräts vorhandenen Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr "Liste der auf der Speicherkarte des Geräts vorhandenen Bücher"
 
@@ -6039,6 +6341,10 @@ msgstr "Konnte SSH Sitzung nicht abschließen: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Authentifizierung schlug fehl am Server: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr "eMail Versand kontrollieren"
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -6333,34 +6639,41 @@ msgstr "Laden der Artikel schlug fehl: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Rufe Feed ab"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "Spanisch"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Kroatisch"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Serbisch"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6408,7 +6721,7 @@ msgstr "Spanisch"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6460,27 +6773,35 @@ msgstr "Spanisch"
 msgid "English"
 msgstr "Englisch"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "Serbisch"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Spanisch"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "Französisch"
 
@@ -6489,6 +6810,10 @@ msgstr "Französisch"
 msgid "Dutch"
 msgstr "Niederländisch"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr "Bosnisch"
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6499,7 +6824,7 @@ msgstr "Portugisisch"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6510,10 +6835,6 @@ msgstr "Deutsch"
 msgid "Kovid Goyal"
 msgstr "Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "Kroatisch"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "Italienisch"
@@ -6611,6 +6932,25 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "&Priorität der Konvertierungsaufträge:"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Verbindung nicht möglich"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr ""
+#~ "Sie müssen einen gültigen Zugangsschlüssel (access key) für isbndb.com "
+#~ "angeben"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Metadaten abrufen für <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Kostenloses Konto anmelden bei <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> um einen Zugriffsschlüssel zu "
+#~ "erhalten."
+
 #~ msgid "&Access Key;"
 #~ msgstr "&Zugriffsschlüssel:"
 
@@ -6695,9 +7035,6 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "Cannot kill waiting jobs."
 #~ msgstr "Kann Aufträge in Warteliste nicht abbrechen."
 
-#~ msgid "Double click to <b>edit</b> me<br><br>"
-#~ msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
-
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Änderungen treten erst nach einem Neustart in Kraft."
 
@@ -6868,6 +7205,9 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Elemente mit dem Attribut class=\"chapter\" anzugleich, müsste man \"h\\"
 #~ "d,class,chapter\" benutzen. Voreinstellung ist %default"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Fehler beim Abrufen der Metadaten"
+
 #~ msgid ""
 #~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 #~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -6944,6 +7284,9 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Daten (in \n"
 #~ "einer OPF Datei). Sie erhalten ID Nummern mit dem Befehl \"list\". \n"
 
+#~ msgid "Send to storage card by default"
+#~ msgstr "Auf die Speicherkarte senden (Voreinstellung)"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "A&nzahl der Umschlagbilder, die (nach einem Neustart) in der Cover-Ansicht "
@@ -7269,3 +7612,6 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 #~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
 #~ "family:'DejaVu Sans';\"></p></body></html>"
+
+#~ msgid "Send specific format to device"
+#~ msgstr "Spezielles Format an das Gerät senden"
diff --git a/src/calibre/translations/nl.po b/src/calibre/translations/nl.po
index 9f984763f8..a0261fcda6 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: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-02-23 21:54+0000\n"
 "Last-Translator: Anne-Sophie Cauwe <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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Doet absoluut niets."
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Doet absoluut niets."
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Doet absoluut niets."
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Lees de metadata van de %s bestanden"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lees de metadata van ebooks in ZIP archieven"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lees de metadata van ebooks in RAR archieven"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Bepaal metadata in %s bestanden"
 
@@ -223,17 +231,17 @@ msgstr "Desactiveer de genoemde plugin"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Er is geen geheugen kaart verbonden met de reader."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Er is onvoldoende vrije plaats op de geheugenkaart"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -487,7 +495,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -498,14 +506,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Een bron HTML bestand is nodig"
 
@@ -524,24 +532,24 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Schrijf verwerkte HTML naar "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Opties voor de verwerking van HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "De uitvoer folder. Standaard is de huidige folder."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr "Karakter codering voor HTML bestanden. Standaard is auto detect."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -549,11 +557,11 @@ msgstr ""
 "Genereer de uitvoer in een zip bestand. Als deze optie is gekozen, dan moet -"
 "-output de naam van een bestand zijn, niet de folder."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Configueer het volgen van links in HTML bestanden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -561,7 +569,7 @@ msgstr ""
 "Volg links in HTML bestanden in de breedte. Standaard worden ze eerst in de "
 "diepte gevolgd."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -570,39 +578,39 @@ msgstr ""
 "Deze waarde kan niet negatief zijn. Gebruik 0 aan te geven dan links in het "
 "top HTML bestand niet zullen worden gevolgd."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Metadata van het gegenereerde eboek"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Titel. Standaard is auto-detect."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Opties handig voor debuggen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -610,12 +618,12 @@ msgstr ""
 "Geen meer informatie tijdens verwerking. Dit kan meerder malen worden "
 "opgegeven om meer informatie te verkrijgen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Uitvoer HTML is \"mooi geprint\" om makkelijker door mensen leesbaar te zijn"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -636,7 +644,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [opties] LITBESTAND"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Output folder. Standaard is dit de huidige folder."
 
@@ -653,7 +661,7 @@ msgid "Useful for debugging."
 msgstr "Handig voor Debugging"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB boek bemaakt in"
 
@@ -696,9 +704,9 @@ msgid "Sort key for the author"
 msgstr "Zoeksleutel voor de auteur"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Uitgeverij"
 
@@ -1575,63 +1583,63 @@ msgstr "Geef de auteur"
 msgid "Set the comment"
 msgstr "Geef de omschrijving"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Opmerkingen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Tags"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Tijdsaanduiding"
 
@@ -1764,7 +1772,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1780,11 +1788,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [opties] mijnboek.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "RAW MOBI HTML bewaard in"
 
@@ -1951,99 +1959,103 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Vaak gebruikte folders"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 "Het formaat te gebruiken voor het wegschrijven van enkele bestanden naar "
 "schijf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Bevestig alvorens verwijdering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "werkbalk ikoon grootte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Laat labels zien in de werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Hoofdscherm geometrie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Gebruik Romeinse nummers voor serie nummers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Aantal boek covers te laten zien in cover browsing modus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Standaarden voor conversie naar LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Opties voor de LRF eboek viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -2082,7 +2094,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -2090,43 +2102,187 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Apparaat niet meer verbonden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Lees apparaat informatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Lees boeken lijst van apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Verstuur metadata naar apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Upload %d boeken naar apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Verwijder boeken van apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Download boeken van apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Bekijk book op apparaat"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "en verwijder uit bibliotheek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Stuur naar hoofdgeheugen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Stuur naar opslag kaart"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Geen geschikte formaten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Boeken worden naar de lezer verzonden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"De volgende boeken konden niet naar de lezer worden deupload, omdat geen "
+"geschikt formaat werd gevonden:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Geen schijfruimte op de lezer."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>De boeken kunnen niet worden geupload naar de lezer, omdat er onvoldoende "
+"schijfruimte beschikbaar is "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pad"
@@ -2135,7 +2291,8 @@ msgstr "Pad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2233,128 +2390,177 @@ msgstr "&Wijd"
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Foutieve database locatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Moet een folder zijn."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Foutieve database locatie "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Moet een folder zijn."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Foutieve database locatie.<br>Kan niet schrijven naar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Database aan het comprimeren. Dit kan even duren."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Comprimeren..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Database aan het comprimeren. Dit kan even duren."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2362,16 +2568,16 @@ msgstr ""
 "&Locatie van eboeken. (De eboeken zijn opgeslagen in de folders gesorteerd "
 "op auteur, en metadata word bewaard in eht bestand metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Blader naar de nieuwe database locatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2389,36 +2595,36 @@ msgstr "Blader naar de nieuwe database locatie"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Notificeer als een &nieuwe versie beschikbaar is"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Opglagformaat voor &enkel bestand:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "Standaard netwerk &timeout:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2426,176 +2632,277 @@ msgstr ""
 "Geef de standaard timeout voor netwerk downloads. (bv. wanneer we informatie "
 "van het Internet moeten halen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " seconden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Voeg een folder toe aan de lijst met vaak gebruikte folders"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Verwijder een folder van de lijst met vaak gebruikte folders"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Gebruik &Romeinse nummers voor de series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Groot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Middel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Knop grootte in werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Laat &tekst zien in werkbalk knoppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Selecteer zichtbare &kolommen in bibliotheek weergave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "Gebr&uikersnaam:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "W&achtwoord:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Geef ongebruikte diskruimte uit de database terug"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Comprimeer database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadata van bestands naam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "Gebr&uikersnaam:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "W&achtwoord:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Geef wachtwoord weer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2604,33 +2911,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2658,7 +2965,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadata"
@@ -2712,26 +3019,26 @@ msgstr "Kies cover voor "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Kan niet lezen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Je hebt geen permissie om het bestand te lezen: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Fout bij het lezen van bestand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Er is een fout opgetreden bij het lezen van bestand: <br /><b>"
 
@@ -2741,7 +3048,7 @@ msgid " is not a valid picture"
 msgstr " is geen geldige afbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Kan niet converteren"
 
@@ -3068,52 +3375,55 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Auteur sortering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Kan geen verbinding maken"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Een geldige toegangssleutel is nodig voor isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Fout bij ophalen metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Geen metadata gevonden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Geen metadata gevonden, probeer een andere titel en auteur of ISBN nummer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Download metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Download metadata voor <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Geef je op voor een gratis account van <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> om een toegangssleutel te "
-"krijgen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3449,33 +3759,33 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3485,26 +3795,44 @@ msgstr ""
 "<br/>Als u deze niet heeft, dan kunt u er gratis een krijgen door te <a "
 "href='http://www.librarything.com'>registreren</a></p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Kan omslag niet downloaden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Het ISBN nummer voor dit boek moet worden opgegeven."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Omslag kon niet worden gedownload</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Het ISBN nummer voor dit boek moet worden opgegeven."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3585,84 +3913,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Voeg een persoonlijke nieuwsbron toe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4083,11 +4412,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Geen overeenkomst"
 
@@ -4173,45 +4502,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr "Taak is al uitgevoerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Grootte (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Waardering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Geen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Boek <font face=\"serif\">%s</font> van %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Dubbel-klik om me te <b>wijzigen</b><br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Zoeken (Voor geavanceerd zoeken klik op de knop links)"
 
@@ -4241,7 +4574,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Geen Resultaten</b> voor de zoekterm <i>%s</i> gevonden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Geen resultaten gevonden"
 
@@ -4288,23 +4621,23 @@ msgstr "Open eboek"
 msgid "Configure"
 msgstr "Configureer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4312,127 +4645,108 @@ msgstr ""
 "<p>Voor assistentie, bezoek <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 "<b>%s</b>: %s door <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Stuur naar hoofdgeheugen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Stuur naar opslag kaart"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "en verwijder uit bibliotheek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Bewaar standaard op geheugen kaart"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Bewerk metadata individueel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Bewerk metadata in groep"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Voeg boeken toe uit een enkele folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Opslaan op schijf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Opslaan op schijf in een enkele folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Bewaar alleen %s formaat op schijf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Bekijk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Bekijk specifiek formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Converteer Individueel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Converteer Groep"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Zet standaarden voor conversie van comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Kies een locatie voor de eboek  bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Apparaat: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " gedetecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Verbonden "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Apparaat Database Beschadigd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4461,129 +4775,94 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Boeken worden geupload naar de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Geen schijfruimte op de lezer."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>De boeken kunnen niet worden geupload naar de lezer, omdat er onvoldoende "
-"schijfruimte beschikbaar is "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Boeken worden verwijderd van de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Metedata kan niet worden gewijzigd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Geen boeken geselecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Boeken worden naar de lezer verzonden."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Geen geschikte formaten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"De volgende boeken konden niet naar de lezer worden deupload, omdat geen "
-"geschikt formaat werd gevonden:<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Kan niet naar schijf worden opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4591,64 +4870,64 @@ msgstr ""
 "<p>De volgende boeken konden niet worden bewaard op schijf, omdat het %s "
 "formaat niet beschikbaar is:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Sommige boeken konden niet worden opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Downloading nieuws van "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Geen boek geselecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Kan niet bekijken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Kies het te bekijken formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s heeft geen beschikbare formaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Kan niet configureren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Can niet configueren terwijl bestaande opdrachten bezig zijn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Copieer bibliotheek naar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "ongeldige database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4656,23 +4935,23 @@ msgstr ""
 "<p>Een ongeldige database bestaat op %s, verwijder deze voordat je probeert "
 "de bestaande database te verplaatsen.<br>Foutmelding: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Database kon niet worden verplaatst"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Geen details beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr "Geen details zijn beschikbaar voor de boeken op de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4680,54 +4959,54 @@ msgstr ""
 "Er is een tijdelijke fout opgetreden tijdens de communicatie met de lezer. "
 "verwijzer de lezer en plug hem opnieuw in, of herstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Converteer Fout"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4735,7 +5014,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Laatste versie: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Update beschikbaar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4745,49 +5028,45 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nieuwe functies</a> "
 "Bezoek download pagina?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Update beschikbaar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Geavanceerde Zoekopdracht"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Zoeken:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4795,7 +5074,7 @@ msgstr ""
 "Zoek de boekenlijst op titel of auteur<br><br>Meerdere woorden met spaties "
 "worden allen gebruikt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4803,113 +5082,109 @@ msgstr ""
 "Zoek de boekenlijst op titel, auteur, uitgeverij, tags of "
 "opmerkingen.<br><br>Meerdere woorden met spaties worden allen gebruikt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Snelzoeken wissen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Voeg boeken toe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Verwijder boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Wijzig meta informatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Zend naar lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Download niews"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Converteer E-boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5101,84 +5376,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5229,45 +5504,45 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Ongeldige reguliere expressie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Ongeldige reguliere expressie: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Klik om een de lijst met boeken op uw computer te zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Klik om de lijst met boeken in het hoofdgeheugen van uw lezer te zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr "Klik om de lijst met boeken op de opslag kaart van uw lezer te zien"
 
@@ -5695,6 +5970,10 @@ msgstr "SSH sessie kon niet tot stand worden gebracht: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Authenticatie met server mislukt: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5984,34 +6263,41 @@ msgstr "Artikel download mislukt: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Downloading feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6059,7 +6345,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6111,20 +6397,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -6132,6 +6425,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -6140,6 +6434,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6150,7 +6448,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6161,10 +6459,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
@@ -6259,6 +6553,23 @@ msgstr ""
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "&Prioriteit van conversie batch"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Kan geen verbinding maken"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Een geldige toegangssleutel is nodig voor isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Download metadata voor <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Geef je op voor een gratis account van <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> om een toegangssleutel te "
+#~ "krijgen."
+
 #~ msgid "&Access Key;"
 #~ msgstr "&Toegangssleutel"
 
@@ -6343,9 +6654,6 @@ msgstr ""
 #~ msgid "Cannot kill waiting jobs."
 #~ msgstr "Wachtende opdrachten kunnen niet worden afgebroken."
 
-#~ msgid "Double click to <b>edit</b> me<br><br>"
-#~ msgstr "Dubbel-klik om me te <b>wijzigen</b><br><br>"
-
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Veranderingen zijn pas zichtbaar na een herstart."
 
@@ -6482,6 +6790,9 @@ msgstr ""
 #~ "Voeg de gespecificeerde bestanden als boeken toe aan de database. Je kunt "
 #~ "ook folders opgeven, zie de folder-gerelateerde opties hieronder. \n"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Fout bij ophalen metadata"
+
 #~ msgid ""
 #~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 #~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -6557,6 +6868,9 @@ msgstr ""
 #~ "het boek, de cover en metadata (in een opf bestand) Je kunt id nummers zien\n"
 #~ "via het list commando. \n"
 
+#~ msgid "Send to storage card by default"
+#~ msgstr "Bewaar standaard op geheugen kaart"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr "&Aantal covers zichtbaar in blader modus (na herstart):"
 
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index d42fc5f148..1e2574f797 100644
--- a/src/calibre/translations/pl.po
+++ b/src/calibre/translations/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-03-18 10:25+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-21 09:53+0000\n"
 "Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Ta opcja nic nie zmienia"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Ta opcja nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Ta opcja nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Odczytaj metadane z %s plików"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Wyodrębnij okładki z plików komisów"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Odczyt metadanych z e-booków w archiwach ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Odczyt metadanych z e-booków w archiwach RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Ustaw metadane w %s plikach"
 
@@ -228,17 +236,17 @@ msgstr "Wyłącz wtyczkę"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Brak karty pamięci w czytniku."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Na karcie pamięci jest niewystarczająca ilość wolnego miejsca"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Niewystarczająca ilość wolnej pamięci głównej"
 
@@ -530,7 +538,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "Nie znaleziono e-book'a w archiwum"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -547,14 +555,14 @@ msgstr ""
 "Jeśli wybierzesz plik OPF zamiast pliku HTML, lista odnośników będzie brana "
 "z elementu <spine> w pliku OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Plik wyjściowy zapisany w "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Musisz podać wejściowy plik HTML"
 
@@ -577,25 +585,25 @@ msgstr ""
 "\t\tZa dużo oznaczeń. Ponowne dzielenie bez zachowania struktury. Może to "
 "doprowadzić do złego renderowania."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Zapisz przekształcony HTML w "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Opcje do kontroli traversal w HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Folder wyjściowy. Domyślny folder to folder bieżący."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Kodowanie znaków dla plików HTML. Domyślnie jest to wybór automatyczny."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -603,11 +611,11 @@ msgstr ""
 "Stwórz plik formatu .zip. Jeśli ta opcja jest zaznaczona, wartość --output "
 "powinna być nazwą pliku a nie katalogu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Kontrola śledzenia odnośników w plikach HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -615,7 +623,7 @@ msgstr ""
 "Przechodź przez odnośniki w plikach HTML wszerz. Standardowo używany jest "
 "algorytm wgłębny."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -624,39 +632,39 @@ msgstr ""
 "Musi być liczbą nieujemną. 0 oznacza, że w głównym pliku html nie podąża się "
 "za żadnymi linkami."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Ustaw metadane w wygenerowanym e-booku."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Ustaw tytuł ksiązki. Domyślnie jest on wykrywny automatycznie."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Temat(y) tej książki, jako lista rozdzielona przecinkami."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Ustaw wydawcę tej książki"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Podsumowanie tej książki."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Wczytaj metadane ze wskazanego pliku OPF"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Opcje przydatne do diagnostyki"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -664,11 +672,11 @@ msgstr ""
 "Wyświetlaj szczegółowe komunikaty w czasie pracy. Zaznaczenie w wielu "
 "miejscach zwiększa liczbę szczegółów."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr "Wyjściowy HTML jest \"ładnie drukowany\" dla łatwiejszej analizy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -689,7 +697,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [opcje] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Folder docelowy. Domyślnie to aktualny folder."
 
@@ -706,7 +714,7 @@ msgid "Useful for debugging."
 msgstr "Użyteczne dla debugowania."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB ebook stworzony w"
 
@@ -751,9 +759,9 @@ msgid "Sort key for the author"
 msgstr "Sortuj wg autora"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Wydawca"
 
@@ -1548,63 +1556,63 @@ msgstr "Ustaw autorów"
 msgid "Set the comment"
 msgstr "Ustaw komentarz"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Tytuł"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(rzy)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Komentarze"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Etykiety"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Seria"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Język"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1722,7 +1730,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr "Ustaw ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1738,11 +1746,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1909,98 +1917,102 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Ostatnio używane foldery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr "Format używany do zapisu pojedynczych plików na dysku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Potwierdź przed usunięciem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Wielkość ikon na paskach narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Pokaż etykiety przycisków na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Struktura głównego okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Używaj numeracji rzymskiej do numerowania serii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Sortuj etykiety według popularności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Domyślne wartości dla konwersji do LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 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:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Pokaż ikonę w zasobniku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Prześlij pobrane aktualności na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 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:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -2039,7 +2051,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -2047,43 +2059,184 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Urządzenie zostało już odłączone."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Pobierz informacje o urządzeniach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Pozyskaj listę książek na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Prześlij metadane do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Prześlij %d książek na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Usuń książki na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Pobierz książki z urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Zobacz ksiązki na urządzeniu"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "i usuń z biblioteki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Wyślij do karty pamięci."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+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:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "przez"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Przesyłanie aktualności na urządzenie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Wysyłanie książek do urządzenia."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p> Nie można umieścić książek na urządzeniu z powodu braku wolnego miejsca "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Ścieżka"
@@ -2092,7 +2245,8 @@ msgstr "Ścieżka"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2190,128 +2344,177 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " - wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "przez"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Ogólne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Interfejs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Niewłaściwa ścieżka do wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s nie jest właściwą ścieżką do wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Wybierz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "Wtyczka nie może zostać wyłączona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "Wtyczka %s nie może zostać wyłączona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Ta wtyczki nie można dostosowywać"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Dostosuj %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "Nie można usunąć wbudowanej wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Dziennik błędów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Dziennik dostępów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Włączanie serwera zakończone niepowodzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Niewłaściwy rozmiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Niewłaściwa lokalizacja bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Musi być katalogiem."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Niewłaściwa lokalizacja bazy danych "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Musi być katalogiem."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Niewłaściwa lokalizacja bazy danych.<br>Nie można zapisać do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Kompaktowanie bazy danych. To może chwilę potrwać."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Kompaktowanie..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Kompaktowanie bazy danych. To może chwilę potrwać."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Ustawienia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2319,16 +2522,16 @@ msgstr ""
 "&Lokalizacja książek (Książki są przechowywane w folderach posortowanych "
 "według autorów a metadane znajdują się w pliku metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Wybierz nową lokalizację bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2346,147 +2549,260 @@ msgstr "Wybierz nową lokalizację bazy danych"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Pokaż powiadomienie, gdy &nowa wersja jest dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Wczytytuj &metadane z plików"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Format zapisu dla &pojedynczego pliku:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Wybierz &język (wymaga restartu):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normalny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Wysoki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Niski"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "&Priorytet zdań:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Używaj numeracji &rzymskiej do numerowania serii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Aktywuj ikonę w &zasobniku systemowym (wymaga ponownego uruchomienia)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr "Pokaż &powiadomienia w zasobniku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Automatycznie przesyłaj pobrane &aktualności na czytnik e-książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "&Usuń aktualności z biblioteki po przesłaniu ich na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Duże"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Średnie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Małe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Rozmiar przycisków na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Pokazuj &tekst pod przyciskami na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Wybierz &kolumny pokazywane w widoku biblioteki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Użyj &wewnętrzej przeglądarki dla:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "Nazwa &użytkownika:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Hasło:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Kompaktuj bazę danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadane z nazwy pliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2496,65 +2812,53 @@ msgstr ""
 "pomocą przeglądarki z dowolnego miejsca na świecie. Jakiekolwiek zmiany w "
 "ustawieniach zostaną zatwierdzone po ponownym uruchomieniu serwera."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "&Port serwera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "Nazwa &użytkownika:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Hasło:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Pokaż hasło"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Maks. rozmiar &okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "&Włącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "W&yłącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Testuj serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "Uruchom serwer &automatycznie przy starcie aplikacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Pokaż dziennik &serwera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2563,7 +2867,7 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -2571,27 +2875,27 @@ msgstr ""
 "Tutaj można dostosować zachowanie Calibre poprzez kontrolę wtyczek, których "
 "ma używać."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr "Włącz/&Wyłącz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "&Dostosuj wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "&Usuń wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "Dodaj nową wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Plik wtyczki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Dodaj"
 
@@ -2619,7 +2923,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadane"
@@ -2673,26 +2977,26 @@ msgstr "Wybierz okładkę dla "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Nie można odczytać"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Nie masz uprawnień do odczytu pliku: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Błąd przy odczycie pliku"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2702,7 +3006,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Nie można przekonwertować"
 
@@ -2969,7 +3273,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:518
 msgid "Automatic &chapter detection"
-msgstr ""
+msgstr "Automatyczne wykrywanie &rozdziałów"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:519
 msgid ""
@@ -2989,7 +3293,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:522
 msgid "Automatic &Table of Contents"
-msgstr ""
+msgstr "Automatyczny &spis treści"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:523
 msgid "Number of &links to add to Table of Contents"
@@ -2997,7 +3301,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:524
 msgid "Do not add &detected chapters to the Table of Contents"
-msgstr ""
+msgstr "Nie &dodawaj automatycznie wykrytych rozdziałów do spisu treści"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:525
 msgid "Chapter &threshold"
@@ -3005,7 +3309,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:526
 msgid "&Force use of auto-generated Table of Contents"
-msgstr ""
+msgstr "&Wymuś użycie wygenerowanego automatycznie spisu treści"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:527
 msgid "Level &1 TOC"
@@ -3023,50 +3327,54 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Nie można połączyć się"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Musisz podać właściwy klucz dostępu do isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Błąd podczas pobierania metadanych"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Nie znaleziono metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Pobierz metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Pobierz metadane dla <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Zarejestruj darmowe konto na <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a>, aby otrzymać klucz dostępu."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3385,33 +3693,33 @@ msgstr "Usuń &format:"
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3421,25 +3729,43 @@ msgstr ""
 "nie posiadasz jeszcze konta, możesz się <a "
 "href='http://www.librarything.com'>zarejestrować</a> za darmo!.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Nie można pobrać okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Nie można pobrać okładki.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3520,84 +3846,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Szukaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d źródeł"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Stworzone przez: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Ostatnio pobrano: nigdy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Zaplanuj pobieranie aktualności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Dodaj własne źródło aktualności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4002,11 +4329,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Brak wyników"
 
@@ -4091,45 +4418,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Rozmiar (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Brak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Książka <font face=\"serif\">%s</font> z %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "Niedozwolone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 "Szukaj (Aby użyć zaawansowanego wyszukiwania kliknij przycisk po lewej)"
@@ -4159,7 +4490,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Brak pasujących wyników"
 
@@ -4206,23 +4537,23 @@ msgstr "Otwórz e-book"
 msgid "Configure"
 msgstr "Ustawienia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Błąd podczas komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Przywróć"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Uruchom ponownie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4230,43 +4561,24 @@ msgstr ""
 "<p>Aby uzyskać pomoc odwiedź <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 "<b>%s</b>: %s stworzył <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Wyślij do karty pamięci."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "i usuń z biblioteki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Wysyłaj do karty pamięci domyślnie."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Edytuj metadane pojedynczo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Dodaj książki z pojedyńczego folderu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -4274,7 +4586,7 @@ msgstr ""
 "Dodaj książki z folderów, włączając w to podfoldery (Jedna książka na "
 "folder, zakładając, że każdy plik jest tą samą książką w innym formacie)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -4282,79 +4594,79 @@ msgstr ""
 "Dodaj książki z folderów, włączając w to podfoldery (Wiele książek na "
 "folder, zakładając, że każdy plik jest inną książką)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Zapisz na dysku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Zapisz na dysku w pojedyńczym folderze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Zapisz na dysku jedynie pliki w formacie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Wyświetl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Wyświetl określony format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Konwertuj pojedynczo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Ustaw parametry domyślne konwersji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Ustaw parametry domyślne konwersji komiksów"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Podobne książki..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Wybierz lokalizację dla twojej biblioteki książek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Urządzenie: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " wykryte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Połączone "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4370,126 +4682,94 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "Książki EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "Książki LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "Książki HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "Książki LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "Książki MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Książki tekstowe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "Książki PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Komiksy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Archiwa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p> Nie można umieścić książek na urządzeniu z powodu braku wolnego miejsca "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Usuwanie książek z urządzenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Nie można edytować metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Nie wybrano ksiązek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Przesyłanie aktualności na urządzenie."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr "Wybierz format plików przesyłanych na urządzenie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Wysyłanie książek do urządzenia."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Nie można zapisać na dysku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Wyberz folder docelowy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4497,86 +4777,86 @@ msgstr ""
 "<p>Nie można zapisać poniższych książek na dysku, ponieważ plik w formacie "
 "%s nie jest dla nich dostępny:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Nie można zapisać niektórych e-książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Pobieranie aktualności z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Nie wybrano ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Nie można wyświetlić"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Wybierz format do wyświetlenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "Nie można otworzyć folderu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Nie można skonfigurować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Nie można skonfigurować, gdy są aktywne jakieś zadania."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Kopiowanie bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopiowanie biblioteki do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Nieprawidłowa baza danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Błąd komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4584,60 +4864,64 @@ 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/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Błąd podczas konwersji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Aktualizacja dostępna"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4647,167 +4931,159 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">listę zmian i "
 "poprawek</a>. Otworzyć stronę pobierania?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Aktualizacja dostępna"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "Wynik:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Szukaj:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Wyczyść pasek wyszukiwania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Dopasuj którykolwiek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Dopasuj wszystkie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Sortuj według &popularności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Dodaj książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Usuń książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Edytuj metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Preślij na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Pobierz aktualności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Konwertuj e-ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr "Otwórz folder zawierający"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr "Pokaż szczegóły ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Książki tego samego autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Książki z tej serii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr "Książki tego samego wydawcy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Książki z takimi samymi etykietami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4995,84 +5271,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Przejście do..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Szukanie tekstu w książce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "Wybierz e-book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "E-booki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Dodaj zakładkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Dodaj tytuł zakładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Ta książka jest chroniona przez <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "Błąd DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "Nie można otworzyć e-booka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5123,15 +5399,15 @@ msgstr "Zakładka"
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Nieprawidłowe wyrażenie regularne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5141,29 +5417,29 @@ msgstr ""
 "%d\n"
 "książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Kliknij, aby zobaczyć listę książek dostepnych na twoim komputerze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Kliknij aby zobaczyć listę książek na karcie pamięci w twoim czytniku."
@@ -5528,6 +5804,10 @@ msgstr "Nie udało się wynegocjować sesji SSH: "
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5768,34 +6048,41 @@ msgstr "Pobieranie artykułu nie powiodło się: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "Hiszpańskie"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Chorwackie"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Serbskie"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5843,7 +6130,7 @@ msgstr "Hiszpańskie"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5895,27 +6182,35 @@ msgstr "Hiszpańskie"
 msgid "English"
 msgstr "Angielskie"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "Serbskie"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Hiszpańskie"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "Francuskie"
 
@@ -5924,6 +6219,10 @@ msgstr "Francuskie"
 msgid "Dutch"
 msgstr "Holenderskie"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5934,7 +6233,7 @@ msgstr "Portugalskie"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5945,10 +6244,6 @@ msgstr "Niemieckie"
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "Chorwackie"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "Włoskie"
@@ -5997,6 +6292,22 @@ msgstr ""
 #~ msgid "Don't know what this is for"
 #~ msgstr "Nie wiem do czego to służy"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Nie można połączyć się"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Musisz podać właściwy klucz dostępu do isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Pobierz metadane dla <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Zarejestruj darmowe konto na <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a>, aby otrzymać klucz dostępu."
+
 #~ msgid "Options"
 #~ msgstr "Ustawienia"
 
@@ -6018,6 +6329,12 @@ msgstr ""
 #~ msgid "Database does not exist"
 #~ msgstr "Baza danych nie istnieje"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Błąd podczas pobierania metadanych"
+
+#~ msgid "Send to storage card by default"
+#~ msgstr "Wysyłaj do karty pamięci domyślnie."
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "&Liczba wyświetlanych okładek podczas przeglądania (po ponownym "
diff --git a/src/calibre/translations/pt.po b/src/calibre/translations/pt.po
index 0f23bc8153..890362b887 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: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-03-19 16:06+0000\n"
-"Last-Translator: ritibelle <Unknown>\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-20 00:18+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Não faz absolutamente nada"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Lê os metadados dos ficheiros %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Extrai a capa dos ficheiros de banda desenhada"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lê os metadados dos arquivos ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lê os metadados dos arquivos RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Define os metadados dos ficheiros %s"
 
@@ -230,17 +238,17 @@ msgstr "Desactivar o extra mencionado"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "O leitor não tem nenhum cartão de memória ligado."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "O espaço livre no cartão de memória é insuficiente"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "O espaço livre na memória principal é insuficiente"
 
@@ -565,7 +573,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "Foi impossível localizar um livro dentro do arquivo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -583,14 +591,14 @@ msgstr ""
 "ligações é retirada do\n"
 "elemento <spine> do ficheiro OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Resultado escrito para "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Deve especificar um ficheiro HTML de origem"
 
@@ -613,26 +621,26 @@ msgstr ""
 "\t\tDemasiada formatação. Separar novamente sem preservação da estrutura. "
 "Isto pode levar a uma representação incorrecta."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "HTML processado escrito no "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Opções para controlar o encaminhamento do HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Pasta de destino. A predefinida é a pasta actual."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Codificação de caracteres para os ficheiros HTML. A predefinição é a "
 "detecção automática."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -640,11 +648,11 @@ msgstr ""
 "Criar o resultado num ficheiro zip. Se esta opção for especificada o --"
 "output deve ser o nome de um ficheiro, não de uma pasta."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Controlar a sequência das ligações nos ficheiros HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -652,7 +660,7 @@ msgstr ""
 "Encaminhar as ligações nos ficheiros HTML, primeiro em largura. Normalmente "
 "são encaminhadas primeiro em profundidade."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -661,39 +669,39 @@ msgstr ""
 "Deve ser não negativo. 0 implica que nenhuma ligação é seguida na raiz do "
 "ficheiro HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Definir os metadados do livro gerado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Definir o título. A predefinição é detectar automaticamente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "O(s) autor(es) do livro, como uma lista separada por &."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "O(s) assunto(s) deste livro, como uma lista separada por vírgulas."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Definir a editora deste livro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Um resumo deste livro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Carregar os metadados a partir do ficheiro OPF especificado"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Opções úteis para depurar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -701,12 +709,12 @@ msgstr ""
 "Apresentar mais indicações durante o processamento. Pode ser especificado "
 "mais do que uma vez para aumentar o número de indicações."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "O HTML resultante é \"alindado\" para uma análise mais fácil por humanos"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -736,7 +744,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Pasta de destino. A predefinição é a pasta actual."
 
@@ -753,7 +761,7 @@ msgid "Useful for debugging."
 msgstr "Útil para depurar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "Livro OEB criado em"
 
@@ -796,9 +804,9 @@ msgid "Sort key for the author"
 msgstr "Chave de ordenação para o(s) autor(es)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Editora"
 
@@ -1709,63 +1717,63 @@ msgstr "Definir o(s) autor(es)"
 msgid "Set the comment"
 msgstr "Definir o comentário"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Produtor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Comentários"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Séries"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Linguagem"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Data"
 
@@ -1898,7 +1906,7 @@ msgstr "Definir a linguagem"
 msgid "Set the ISBN"
 msgstr "Definir o ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Definir dc:language field"
 
@@ -1914,11 +1922,11 @@ msgstr "Utilização: rb-meta file.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "A criar o ficheiro Mobipocket a partir de EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] myebook.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "MOBI HTML em bruto guardado em"
 
@@ -2100,91 +2108,91 @@ msgstr ""
 "\tCorta um pdf. \n"
 "\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Pastas usadas frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr "O formato a usar quando guardar ficheiros individuais no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Confirmar antes de apagar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Tamanho dos ícones da barra de ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Mostrar as descrições nos botões da barra de ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Geometria da janela principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Usar números romanos para número da série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Ordenar a lista de etiquetas por popularidade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Predefinições na conversão para LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Opções para o visualizador de livros LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 "Iniciar automaticamente o servidor de conteúdo no arranque da aplicação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 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:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Mostrar o ícone da área de notificação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Carregar as notícias descarregadas para o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr "Apagar os livros da biblioteca após carregamento para o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
@@ -2192,10 +2200,14 @@ 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:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr "Adicionado %s à biblioteca"
@@ -2234,7 +2246,7 @@ msgid "Adding books to database..."
 msgstr "A adicionar livros à base de dados..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "A ler os metadados..."
 
@@ -2242,43 +2254,187 @@ msgstr "A ler os metadados..."
 msgid "Searching in"
 msgstr "A procurar em"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "O leitor já não está ligado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Ir buscar informação sobre o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Listar os livros presentes no leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Enviar os metadados para o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Carregar %d livros para o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Apagar os livros do leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Descarregar os livros do leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Ver os livro no leitor"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "e apagar da biblioteca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Enviar para a memória principal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Enviar para o cartão de memória"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr "Escolher o formato a enviar para o leitor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "por"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Sem formatos suportados"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Enviar notícias para o leitor."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "A enviar livros para o leitor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"É impossível carregar os seguintes livros para o leitor, visto que não foram "
+"encontrados os formatos adequados:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Sem espaço no leitor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>É impossível carregar os livros para o leitor porque já não há mais "
+"espaço disponível "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Caminho"
@@ -2287,7 +2443,8 @@ msgstr "Caminho"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2387,27 +2544,29 @@ msgstr "&Largo"
 msgid "Disable &Trimming"
 msgstr "Desactivar &Aparar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " - Extras disponíveis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "por"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Avançadas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Geral"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Interface"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Avançadas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2415,103 +2574,150 @@ msgstr ""
 "Servidor de\n"
 "Conteúdos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Extras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Sem caminhos válidos para o extra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s não é um caminho válido para o extra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Escolher o extra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "O extra não pode ser desactivado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "O extra: %s não pode ser desactivado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Extra não personalizável"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "Extra: %s não precisa de personalização"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Personalizar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "É impossível remover o extra integrado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " não pode ser removido. É um extra integrado. Experimente desactivá-lo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Registo de erros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Registo de acesso:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Falha em iniciar o servidor de conteúdos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Tamanho inválido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "O tamanho %s é inválido. Deve estar na forma larguraxaltura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Localização da base de dados inválida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Deve ser uma pasta."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Localização da base de dados inválida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Deve ser uma pasta."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Localização da base de dados inválida.<br>É impossível escrever em "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "A compactar a base de dados. Pode demorar algum tempo."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "A compactar..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "A compactar a base de dados. Pode demorar algum tempo."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Configuração"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2519,16 +2725,16 @@ msgstr ""
 "&Localização dos livros (Os livros estão armazenados em pastas, ordenados "
 "por autor e os metadados estão armazenados no ficheiro metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Navegar para a nova localização da base de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2546,18 +2752,18 @@ msgstr "Navegar para a nova localização da base de dados"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Mostrar notificação quando estiver disponível uma &nova versão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
@@ -2565,19 +2771,19 @@ msgstr ""
 "Se desactivar esta definição os metadados são adivinhados a partir do nome "
 "do ficheiro. Isto pode ser configurado na secção Avançadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Ler os &metadados dos ficheiros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Formato para guardar os ficheiros &individuais:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "Predefinição do &tempo de espera da rede:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2585,113 +2791,226 @@ msgstr ""
 "Definir a predefinição para o tempo de espera para a recolha de dados na "
 "rede (i.e. sempre que se vai à internet buscar informação)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " segundos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Lin&guagem (precisa de reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Alta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Baixa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "&Prioridade do processo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Adicionar uma pasta à lista de pastas usadas frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Remover uma pasta da lista de pastas usadas frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 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/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 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/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr "Mostrar &notificações na área de notificação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 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/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "&Enviar automaticamente as notícias descarregadas para o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "&Apagar as notícias da biblioteca depois de as enviar para o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 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/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Médio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "Tamanho dos &botões da barra de ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Mostar &texto nos botões da barra de ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "&Seleccionar as colunas visíveis na vista da biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Usar o &visualizador interno para:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "&Utilizador:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Palavra-passe:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Espaço em disco não utilizado na base de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Compactar a base de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadados a partir do nome dos ficheiros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2702,23 +3021,11 @@ msgstr ""
 "Quaisquer mudanças nas definições só terão efeito depois do servidor ser "
 "reiniciado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "P&orta do servidor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "&Utilizador:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Palavra-passe:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2726,13 +3033,13 @@ msgstr ""
 "Se deixar a palavra-passe em branco qualque pessoa poderá aceder à sua "
 "colecção de livros usando a interface de rede."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Mostrar a palavra-passe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2740,31 +3047,31 @@ msgstr ""
 "O tamanho máximo (larguraxaltura) para as capas apresentadas. Capas maiores "
 "são redimensionadas. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Tam. máx. da &capa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "&Iniciar o Servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "Pa&rar o Servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Testar o Servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "Correr o servidor &automaticamente no arranque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Ver o registo do &servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2778,7 +3085,7 @@ msgstr ""
 "iPhone. Aqui o myhostname deve ser o nome de domínio ou o endereço IP deste "
 "computador."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -2786,27 +3093,27 @@ msgstr ""
 "Aqui pode personalizar o comportamento do Calibre controlando quais os "
 "extras que este utiliza."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr "Activar/&Desactivar o extra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "&Personalizar o extra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "&Remover o extra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "Adicionar novo extra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Ficheiro com o extra:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Adicionar"
 
@@ -2834,7 +3141,7 @@ msgstr "Converter %s em "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadados"
@@ -2894,26 +3201,26 @@ msgstr "Escolher a capa para "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "É impossível ler"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Não tem permissão para ler o ficheiro: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Erro ao ler o ficheiro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Houve um erro ao ler do ficheiro: <br /><b>"
 
@@ -2923,7 +3230,7 @@ msgid " is not a valid picture"
 msgstr " não é uma imagem válida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "É impossível converter"
 
@@ -3263,52 +3570,56 @@ msgstr "&Título para a Tabela de Conteúdos gerada:"
 msgid "Level &3 TOC"
 msgstr "Tabela de Conteúdos de Nível &3:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Ordenação do(s) Autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "É impossível ligar"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Deve especificar uma chave de acesso válida em isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Erro ao recolher os metadados"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Não foram encontrados metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Não foram encontrados metadados, experimente ajustar o título e o autor ou a "
 "chave ISBN."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Recolher os metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Recolher os metadados para <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Registar uma conta grátis em <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> para ter uma chave de acesso."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3650,33 +3961,33 @@ msgstr "Remover &formatos:"
 msgid "A&utomatically set author sort"
 msgstr "Definir a&utomaticamente a ordenação do(s) autor(es)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr "Sem formato seleccionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr "É impossível ler os metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr "É impossível ler os metadados do formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr "É impossível ler a capa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr "É impossível ler a capa do formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr "A capa do formato %s é inválida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3686,26 +3997,44 @@ msgstr ""
 "não os tem pode <a href='http://www.librarything.com'>registar-se</a> "
 "gratuitamente!.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
-msgstr "Capa com erros"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr "A capa não é uma imagem válida"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "É impossível recolher a capa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Tem de especificar o ISBN deste livro."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>É impossível recolher a capa.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Tem de especificar o ISBN deste livro."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr "Capa com erros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr "A capa não é uma imagem válida"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3786,84 +4115,85 @@ msgstr "Personalizar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr "Programado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Procurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d receitas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr "Segundas-Feiras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr "Terças-Feiras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr "Quartas-Feiras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr "dias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr "Sextas-Feiras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr "Sábados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr "Domingos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr "Quintas-Feiras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr "Deve definir a informação da conta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr "Esta receita precisa de um utilizador e de uma palavra-passe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Criado por: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr "à %d dias, %d horas e %d minutos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr "Último descarregamento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Último descarregamento: nunca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Programar o descarregamento de notícias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Adicionar uma fonte de notícias personalizada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4309,11 +4639,11 @@ msgstr "Expressão regular (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Sem correspondências"
 
@@ -4398,35 +4728,35 @@ msgstr "É impossível parar os processos que comunicam com o leitor"
 msgid "Job has already run"
 msgstr "O processo já correu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Tamanho (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Avaliação"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Vazio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 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.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "Não permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -4434,11 +4764,15 @@ msgstr ""
 "Arrastar para o leitor não é suportado. Primeiro adicionar o livro à "
 "biblioteca do Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Procura (Para a Procura Avançada clique no botão da esquerda)"
 
@@ -4469,7 +4803,7 @@ msgstr ""
 "<i>%s</i> ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Não foram encontradas correspondências"
 
@@ -4516,23 +4850,23 @@ msgstr "Abrir o livro"
 msgid "Configure"
 msgstr "Configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Erro ao comunicar com o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Restaurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr "&Faça um donativo para ajudar o Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4540,42 +4874,23 @@ msgstr ""
 "<p>Para ajuda visite <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s por <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Enviar para a memória principal"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Enviar para o cartão de memória"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "e apagar da biblioteca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Enviar para o cartão de memória por predefinição"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Editar os metadados individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Editar os metadados a granel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Adicionar os livros a partir de uma pasta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -4584,7 +4899,7 @@ msgstr ""
 "pasta, assume que todos os ficheiros de livros na mesma pasta estão em "
 "formatos diferentes)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -4593,79 +4908,79 @@ msgstr ""
 "livros por pasta, assume que todos os ficheiros de livros são livros "
 "diferentes)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Guardar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Guardar no disco numa única pasta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Guardar só os formatos %s no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Ver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Ver o formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Converter individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Converter a granel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Definir as predefinições para a conversão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Definir as predefinições para a conversão de banda desenhada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Livros semelhantes..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Localização da base de dados com erros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Escolher a localização para a sua biblioteca de livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr "Navegar pelas capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Leitor: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Ligado "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Base de dados do leitor corrompida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4693,67 +5008,56 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "A carregar os livros para o leitor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "Livros em formato EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "Livros em formato LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "Livros em formato HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "Livros em formato LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "Livros em formato MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Livros em formato texto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "Livros em formato PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Banda desenhada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Arquivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr "A adicionar livros..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Sem espaço no leitor"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>É impossível carregar os livros para o leitor porque já não há mais "
-"espaço disponível "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -4761,63 +5065,39 @@ msgstr ""
 "Os livros seleccionados vão ser <b>permanentemente apagados</b> e os "
 "ficheiros removidos do seu computador. Tem a certeza?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "A apagar livros do leitor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "É impossível editar os metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Sem livros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Enviar notícias para o leitor."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr "Escolher o formato a enviar para o leitor"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "A enviar livros para o leitor"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Sem formatos suportados"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"É impossível carregar os seguintes livros para o leitor, visto que não foram "
-"encontrados os formatos adequados:<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "É impossível guardar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr "A guardar no disco..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr "Guardado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Escolher a pasta de destino"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4825,64 +5105,64 @@ msgstr ""
 "<p>É impossível guardar os seguintes livros no disco porque o formato %s não "
 "está disponível para eles:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "É impossível guardar alguns livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Recolher notícias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr " recolhida."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Sem livro seleccionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "É impossível ver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Escolher o formato para ver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "É impossível abrir a pasta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s não tem formatos disponíveis."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "É impossível configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "É impossível configurar enquanto estiverem processos a correr."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "A copiar a base de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "A copiar a biblioteca para "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Base de dados inválida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4890,23 +5170,23 @@ msgstr ""
 "<p>Já existe uma base de dados inválida em %s, apague-a antes de tentar "
 "mover a base de dados existente.<br>Erro: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "É impossível mover a base de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Sem informação detalhada disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr "Sem informação detalhada disponível para os livros no leitor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Erro ao comunicar com o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4914,13 +5194,13 @@ msgstr ""
 "Houve um erro temporário ao comunicar com o leitor. Por favor desligue e "
 "volte a ligar o leitor ou reinicie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Erro de conversão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4928,15 +5208,15 @@ msgstr ""
 "<p>É impossível converter: %s<p>É um livro com <a href=\"%s\">DRM</a>. "
 "Primeiro tem de remover o DRM usando ferramentas de terceiros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr "Localização da biblioteca inválida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr "É impossível aceder a %s. A usar %s como a biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4945,11 +5225,11 @@ msgstr ""
 "acha útil, por favor considere fazer um donativo para ajudar no seu "
 "desenvolvimento."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 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/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
@@ -4959,11 +5239,11 @@ msgstr ""
 "                      'Sair pode causar corrupção no leitor.<br>\n"
 "                      'Tem a certeza que quer sair?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr "ATENÇÃO: Processos activos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -4971,7 +5251,7 @@ msgstr ""
 "vai continuar a correr na área de notificação. Para fechar escolha "
 "<b>Sair</b> no menu de contexto da área de notificação."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4979,7 +5259,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Última versão: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Actualização disponível"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4989,31 +5273,27 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">as novas "
 "funcionalidades</a>. Visitar a página para descarregar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Actualização disponível"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr "Usar a biblioteca localizada no caminho especificado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr "Iniciar minimizado na área de notificação."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr "Registar a informação de depuração na consola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "Formato:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
@@ -5021,19 +5301,19 @@ msgstr ""
 "Definir o formato que vai ser utilizado para converter os livros e "
 "descarregar as notícias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Procura Avançada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Procura:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -5041,7 +5321,7 @@ msgstr ""
 "Procurar na lista de livros, por título ou autor<br><br>Quando existem "
 "palavras separadas por espaços, os espaços são convertidos em AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -5050,113 +5330,109 @@ msgstr ""
 "comentários<br><br>Quando existem palavras separadas por espaços, os espaços "
 "são convertidos em AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Reiniciar a Procura Rápida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Corresponder algum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Corresponder todos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Ordenar por &popularidade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Adicionar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Remover livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Editar metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Enviar para o leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Recolher notícias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Converter livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr "Abrir a pasta com o conteúdo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr "Mostrar os detalhes do livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Livros do mesmo autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Livros nesta série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr "Livros da mesma editora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Livros com as mesmas etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr "Enviar o formato específico para o leitor"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Preferências"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr "Configurar o Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5351,88 +5627,88 @@ msgstr "O tamanho do tipo de letra monospace padrão em px"
 msgid "The standard font type"
 msgstr "O tipo de letra padrão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Ir para..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Posição no livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Desconhecido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 "Ir para uma referência. Para saber o número da referência use o modo de "
 "referência."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Procurar neste livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "Escolher o livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "Livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Adicionar marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Inserir o título para o marcador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr "Sem correspondências encontradas para: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "A carregar o fluxo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr "A representar %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "A carregar o livro..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Este livro está protegido por <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "Erro de DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "É impossível abrir o livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5486,15 +5762,15 @@ msgstr "Marcadores"
 msgid "Toggle full screen"
 msgstr "Écran inteiro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Expressão regular inválida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Expressão regular inválida: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5504,7 +5780,7 @@ msgstr ""
 "%d\n"
 "livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
@@ -5514,7 +5790,7 @@ msgstr ""
 "%s\n"
 "disponíveis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
@@ -5524,17 +5800,17 @@ msgstr ""
 "%s\n"
 "disponíveis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Clique para ver a lista dos livros disponíveis no seu computador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Clique para ver a lista dos livros disponíveis na memória principal do seu "
 "leitor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Clique para ver a lista dos livros disponíveis no cartão de memória do seu "
@@ -5985,6 +6261,10 @@ msgstr "Falha ao negociar a sessão SSH: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Falha na autenticação com o servidor: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -6278,34 +6558,41 @@ msgstr "Falhou o descarregamento do artigo: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "A recolher a fonte"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "Espanhol"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Croata"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Sérvio"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6353,7 +6640,7 @@ msgstr "Espanhol"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6405,27 +6692,35 @@ msgstr "Espanhol"
 msgid "English"
 msgstr "Inglês"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "Sérvio"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Espanhol"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "Francês"
 
@@ -6434,6 +6729,10 @@ msgstr "Francês"
 msgid "Dutch"
 msgstr "Holandês"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6444,7 +6743,7 @@ msgstr "Português"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6455,10 +6754,6 @@ msgstr "Alemão"
 msgid "Kovid Goyal"
 msgstr "Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "Croata"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "Italiano"
@@ -6505,6 +6800,22 @@ msgstr ""
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Mostrar informação detalhada. Útil para depurar."
 
+#~ msgid "Cannot connect"
+#~ msgstr "É impossível ligar"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Deve especificar uma chave de acesso válida em isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Recolher os metadados para <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Registar uma conta grátis em <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> para ter uma chave de acesso."
+
 #~ msgid "Fetch metadata from server"
 #~ msgstr "Ir buscar os metadados ao servidor"
 
@@ -6514,6 +6825,12 @@ msgstr "Mostrar informação detalhada. Útil para depurar."
 #~ msgid "Change password"
 #~ msgstr "Mudar a palavra-passe"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Erro ao recolher os metadados"
+
+#~ msgid "Send to storage card by default"
+#~ msgstr "Enviar para o cartão de memória por predefinição"
+
 #~ msgid "The author(s) of the ebook, as a comma separated list."
 #~ msgstr "O(s) autor(es) do ebooks, como uma lista separada por vírgulas."
 
@@ -6541,3 +6858,6 @@ msgstr "Mostrar informação detalhada. Útil para depurar."
 
 #~ msgid "Set metadata in RTF files"
 #~ msgstr "Definir metadados em ficheiros RTF"
+
+#~ msgid "Send specific format to device"
+#~ msgstr "Enviar o formato específico para o leitor"
diff --git a/src/calibre/translations/ro.po b/src/calibre/translations/ro.po
index ce6a6d88d4..0a3b29b9cb 100644
--- a/src/calibre/translations/ro.po
+++ b/src/calibre/translations/ro.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-01-29 16:15+0000\n"
 "Last-Translator: petre <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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Nu face absolut nimic"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -222,17 +230,17 @@ msgstr "Dezactivează plugin-ul specificat prin nume"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Cititorul nu are ataşată o cartelă de stocare."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Nu există suficient spaţiu liber pe cartela de stocare"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "Nu există suficient spaţiu liber în memoria principală"
 
@@ -513,7 +521,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "Nu a fost găsită o e-carte în arhivă"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -524,14 +532,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -550,88 +558,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -652,7 +660,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -667,7 +675,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -708,9 +716,9 @@ msgid "Sort key for the author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr ""
 
@@ -1436,63 +1444,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1608,7 +1616,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1624,11 +1632,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1795,97 +1803,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1922,7 +1934,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1930,43 +1942,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -1975,7 +2127,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2073,143 +2226,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2227,211 +2429,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2440,33 +2743,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2494,7 +2797,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2548,26 +2851,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2577,7 +2880,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2898,47 +3201,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3257,58 +3566,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3388,84 +3715,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3863,11 +4191,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3952,45 +4280,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -4019,7 +4351,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4066,148 +4398,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4223,436 +4536,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4838,84 +5116,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4966,44 +5244,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5362,6 +5640,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5599,34 +5881,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5674,7 +5963,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5726,20 +6015,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5747,6 +6043,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5755,6 +6052,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5765,7 +6066,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5776,10 +6077,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/translations/ru.po b/src/calibre/translations/ru.po
index 5591788e56..ac870807bf 100644
--- a/src/calibre/translations/ru.po
+++ b/src/calibre/translations/ru.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
-"PO-Revision-Date: 2009-01-27 19:11+0000\n"
-"Last-Translator: Andrew V. Skvortsov <Unknown>\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
+"PO-Revision-Date: 2009-03-27 02:26+0000\n"
+"Last-Translator: G0LDEN_key <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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@@ -23,16 +23,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
 msgid "Does absolutely nothing"
-msgstr ""
+msgstr "Абсолютно ничего не делать"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -49,21 +50,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -71,21 +74,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -114,11 +121,11 @@ msgstr "Тип файла"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
 msgid "Metadata reader"
-msgstr ""
+msgstr "Чтение Метаданных"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
 msgid "Metadata writer"
-msgstr ""
+msgstr "Запись Метаданных"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
 msgid ""
@@ -126,6 +133,9 @@ msgid ""
 "linked files. This plugin is run every time you add an HTML file to the "
 "library."
 msgstr ""
+"Следовать всем локальным линкам в HTML файле и создать ZIP файл, содержащий "
+"все файлы по линкам. Этот плагин запускается каждый раз когда Вы добавляете "
+"HTML файл в библиотеку."
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:43
@@ -138,27 +148,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Читать метаданные из файла %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Извлечь обложку из файла комиксов"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Читать метаданные из книги в ZIP архив"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Читать метаданные из книги в RAR архив"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Ввести метаданные в файлы %s"
 
@@ -172,7 +183,7 @@ msgstr "Подключить плагин типа файла"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
 msgid "Local plugin customization"
-msgstr ""
+msgstr "Настройка локального плагина"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
 msgid "Disabled plugins"
@@ -180,11 +191,11 @@ msgstr "Отключить плагины"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
 msgid "No valid plugin found in "
-msgstr ""
+msgstr "Не найдено плагина в "
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:185
 msgid "Initialization of plugin %s failed with traceback:"
-msgstr ""
+msgstr "Инициализация плагина %s неудачна с таким результатом:"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:262
 msgid ""
@@ -193,20 +204,25 @@ msgid ""
 "    Customize calibre by loading external plugins.\n"
 "    "
 msgstr ""
+"    %prog опции\n"
+"    \n"
+"    Настройка Сalibre загрузкой внешних плагинов.\n"
+"    "
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:268
 msgid "Add a plugin by specifying the path to the zip file containing it."
-msgstr ""
+msgstr "Добавьте плагин, указав путь к zip файлу, содержащему его."
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:270
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
-msgstr ""
+msgstr "Удаление плагина по имени. Не отразится на встроенных плагинах"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:272
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
+"Настройне плагин. Укажите имя плагина и строку настроек, разделенные запятой."
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:274
 msgid "List all installed plugins"
@@ -222,19 +238,19 @@ msgstr "Отключить названный плагин"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Не подключена карта памяти."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
-msgstr ""
+msgstr "Не хватает свободного места на карточке"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
-msgstr ""
+msgstr "Не хватает свободного места"
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:168
@@ -254,7 +270,7 @@ msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
-"Выходной файл EPUB. Если не назначено, извлекается имя входящего файла."
+"Выходной файл EPUB. Если не указано, извлекается из имени входящего файла."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid ""
@@ -329,6 +345,8 @@ 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 ""
+"Удалять первую картинку из ebook. Полезно в случае, если первая картинка  в "
+"файле-источнике - обложка, а Вы собираетесь указать другую обложку."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid ""
@@ -338,12 +356,20 @@ msgid ""
 "if your source file contains a very large number of page breaks, you should "
 "turn off splitting on page breaks."
 msgstr ""
+"Отключить разбивку файла по страницам. Обычно входные файлы автоматически на "
+"каждом разрыве странице на два файла. Это дает выходной книге возможность "
+"быстрого парсинга и уменьшает ресурсопотребление. Вообще говоря разбивка "
+"медленна ив случае, если Ваш исходный файл имеет очень большое количество "
+"разрывов страниц, Вы можете отключить эту возможность."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "XPath expression to detect page boundaries for building a custom pagination "
 "map, as used by AdobeDE. Default is not to build an explicit pagination map."
 msgstr ""
+"Выражение XPath для детектирования границ страниц - для построения "
+"собственнойстраничной карты, как используется AdobeDE. По умаолчанию "
+"страничная карта не строится."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
@@ -351,6 +377,8 @@ msgid ""
 "relative to its boundary element. Default is to number all pages staring "
 "with 1."
 msgstr ""
+"Выражение XPath для нахождения имени каждой страницы в страничной карте "
+"относительно границ. По умолчанию для номерации всех страниц, начиная с 1."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:165
 msgid ""
@@ -410,6 +438,8 @@ msgid ""
 "of Contents at level three. Each entry is added under the previous level two "
 "entry."
 msgstr ""
+"XPath выражение добавит все заданные тэги в третий уровень Оглавления. "
+"Каждая запись добавляется под предыдущий уровень."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:192
 msgid ""
@@ -429,6 +459,8 @@ msgid ""
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
+"Обычно, если файл-источник уже имеет Оглавление, оно используется в случае "
+"автогенерации."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:202
 msgid "Control page layout"
@@ -465,16 +497,22 @@ msgid ""
 "css. Spacing removal will not work if the source file forces inter-paragraph "
 "spacing."
 msgstr ""
+"Удалить свободное место между параграфами. Также устанавливает отступы для "
+"параграфов 1.5em. Вы можете изменить это добавив p {text-indent: 0cm} к --"
+"override-css. Удаление свободного места не работает, если исходный файл "
+"разбит inter-paragraph порбелами."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:221
 msgid "Do not force text to be justified in output."
-msgstr ""
+msgstr "Не выравнивать текст в выходном файле"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:223
 msgid ""
 "Remove table markup, converting it into paragraphs. This is useful if your "
 "source file uses a table to manage layout."
 msgstr ""
+"Убрать таблицу разметки конвертирования в параграфы. Это полезно, если Ваш "
+"исходный файл использует таблицу для управления видом."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:226
 msgid ""
@@ -482,27 +520,27 @@ msgid ""
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
-"Сохраняет структуру HTML тегов пока разделяется большой файл HTML. Это "
-"необходимо, если файл HTML содержит CSS использующий одноуровневый селектор. "
-"Активизация данной настройки, очень сильно замедляет обработку большого "
-"файла HTML."
+"Сохраняет структуру HTML тегов в процессе разделения больших HTML файлов. "
+"Это необходимо только если файл HTML содержит CSS, использующий "
+"одноуровневые селекторы. Активизация данной настройки, очень сильно "
+"замедляет обработку больших HTML файлов."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:232
 msgid "Print generated OPF file to stdout"
-msgstr "Распечатать созданный файл OPF."
+msgstr "Вывести созданный OPF файл на stdout"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:234
 msgid "Print generated NCX file to stdout"
-msgstr "Распечатать созданный файл NCX."
+msgstr "Вывести созданный NCX файл на stdout"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:237
 msgid "Keep intermediate files during processing by html2epub"
-msgstr "Сохранить промежуточную копию файла во время обработки html2epub"
+msgstr "Сохранять промежуточную копию файла во время обработки html2epub"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:239
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
-msgstr "Извлечь содержимое созданного файла EPUB в специальную дерикторию."
+msgstr "Извлечь содержимое созданного файла EPUB в указанную дерикторию."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:186
 msgid ""
@@ -511,12 +549,16 @@ msgid ""
 "Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
+"%%prog [options] имя файла\n"
+"\n"
+"Конвертировать любое большое количество ebook форматов в файл %s. "
+"Поддерживаются форматы: %s\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:105
 msgid "Could not find an ebook inside the archive"
 msgstr "Не могу найти книгу в архиве"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -533,14 +575,14 @@ msgstr ""
 "Если вы задаете файл OPF вместо HTML, список ссылок содержится в элементе "
 "<spine> файла OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
-msgstr ""
+msgstr "вывод записан на "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Вы должны задать исходный файл HTML"
 
@@ -562,24 +604,24 @@ msgstr ""
 "\t\tОчень много закладок. Переразбейте безструктурное сохранение. Это может "
 "быть причиной некорректного выполнения."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Записывается обработанный HTML в "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Опции контроля просмотра HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Выходная дериктория. По умолчанию текущая дериктория."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr "Кодировка файла HTML. По умолчанию автоопределение."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -587,11 +629,11 @@ msgstr ""
 "Создание выходного zip файла. Если используется эта опция, то  --output имя "
 "файла должно быть отличным от дериктории."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Контроль следования по ссылкам в файле HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -599,7 +641,7 @@ msgstr ""
 "Маршрут включенный в HTML проходится в ширину. Обычно, это проходится "
 "преимущественно в глубину"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -608,39 +650,39 @@ msgstr ""
 "Должно быть не отрицательным. 0 подразумевает нет ссылок для следования в "
 "корневом файле HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Ввести созданные метаданные электронной книги"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Ввести заголовок. По умолчанию автоопределение."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
-msgstr ""
+msgstr "Авторы книги, раздельный список."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Содержание книги, список разделяется запятыми."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Ввести издательство этой книги."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Краткое изложение этой книги."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Загрузить метаданные из подробного OPF файла."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Опции используемые для отладки"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -648,12 +690,12 @@ msgstr ""
 "Добавить больше детализации во время обработки. Может быть  определено путем "
 "увеличения времени повышения детализации."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Выходной HTML \"структурная распечатка\" для простого человеческого анализа"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -664,17 +706,23 @@ msgid ""
 "element\n"
 "is used.\n"
 msgstr ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Следовать всем линкам в HTML файле собрать их в указанной директории.\n"
+"Так же собрать иные ресурсы типа картинок, таблиц стилей, скриптов, и т.п. \n"
+"Если вместо этого указан OPF файл, то список файлов в его <spine> элементе\n"
+"используется.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
-msgstr ""
+msgstr "Создание LIT файла из EPUB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:892
 msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Выходная директория. По умолчанию текущая директория."
 
@@ -691,19 +739,19 @@ msgid "Useful for debugging."
 msgstr "Использовать для отладки."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB книга создана в"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:725
 msgid "%prog [options] OPFFILE"
-msgstr ""
+msgstr "%prog [options] OPFFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:728
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_feeds.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:575
 msgid "Output file. Default is derived from input filename."
-msgstr ""
+msgstr "Выходной файл. По умолчанию название образовано из входящего."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76
 msgid "Set the title. Default: filename."
@@ -734,9 +782,9 @@ msgid "Sort key for the author"
 msgstr "Значение для сортировки по автору"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Издатель"
 
@@ -804,7 +852,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:114
 msgid "Add extra spacing below the header. Default is %default px."
-msgstr ""
+msgstr "Добавлять пустое место после заголовка. По умолчанию %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:116
 msgid ""
@@ -1049,9 +1097,9 @@ msgid ""
 "files from windows computers is cp-1252. Another common choice is utf-8. The "
 "default is to try and guess the encoding."
 msgstr ""
-"Укажите кодировку исходного файла. Если выходной файл LRF содержит "
-"непонятные символы, то попробуйте изменить эту опцию. Распространенная "
-"кодировка для файлов на компьютерах с windows — cp-1251. Другой "
+"Укажите кодировку исходного файла. Если выходной файл LRF содержит \n"
+"непонятные символы, то попробуйте изменить эту опцию. Распространенная \n"
+"кодировка для файлов на компьютерах с windows — cp-1251. Другой \n"
 "распространенный вариант — utf-8. По умолчанию будет сделана попытка угадать "
 "кодировку."
 
@@ -1151,6 +1199,8 @@ msgid ""
 "Disable trimming of comic pages. For some comics, trimming might remove "
 "content as well as borders."
 msgstr ""
+"Отключить тримминг комиксов. Для некоторых комиксов тримминг может удалять "
+"содержимое вместе с границами."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
 msgid "Don't split landscape images into two portrait images"
@@ -1213,7 +1263,7 @@ msgstr "Не показывать строку состояния."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:328
 msgid "Apply no processing to the image"
-msgstr ""
+msgstr "Не обрабатывать картинки"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:333
 msgid ""
@@ -1261,7 +1311,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:24
 msgid "Print generated HTML to stdout and quit."
-msgstr "Напечатать сгенерированный HTML и выйти."
+msgstr "Вывести сгенерированный HTML на stdout и выйти."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:30
 msgid "Keep generated HTML files after completing conversion to LRF."
@@ -1399,10 +1449,10 @@ msgid ""
 "\n"
 "%prog converts mybook.lit to mybook.lrf"
 msgstr ""
-"Usage: %prog [options] mybook.lit\n"
+"Использовать: %prog [options] mybook.lit\n"
 "\n"
 "\n"
-"%prog converts mybook.lit в mybook.lrf."
+"%prog конвертирует mybook.lit в mybook.lrf."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
 msgid ""
@@ -1418,7 +1468,7 @@ msgstr "Выходной файл LRS"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
 msgid "Do not save embedded image and font files to disk"
-msgstr ""
+msgstr "Не сохранять вложенные картинки и шрифты на диск"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
@@ -1515,19 +1565,19 @@ msgstr "Извлечь миниатюру из файла lrf"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:606
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:191
 msgid "Set the publisher"
-msgstr ""
+msgstr "Указать издателя"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
 msgid "Set the book classification"
-msgstr ""
+msgstr "Указать классификацию книги"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
 msgid "Set the book creator"
-msgstr ""
+msgstr "Указать создателя книги"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
 msgid "Set the book producer"
-msgstr ""
+msgstr "Указать производителя книги"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
 msgid ""
@@ -1551,7 +1601,7 @@ msgstr ""
 "Usage: %prog [options] mybook.mobi|prc\n"
 "\n"
 "\n"
-"%prog converts mybook.mobi в mybook.lrf"
+"%prog конвертирует mybook.mobi в mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:48
 msgid "Could not find pdftohtml, check it is in your PATH"
@@ -1631,63 +1681,63 @@ msgstr "Ввести автора"
 msgid "Set the comment"
 msgstr "Ввести комментарии"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Заголовок"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Спонсор"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Комментарии"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Эпилог"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Серия"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Язык"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Временная метка"
 
@@ -1768,7 +1818,7 @@ msgstr "Издательство книги, которое вы хотите н
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:46
 msgid "LibraryThing.com timed out. Try again later."
-msgstr ""
+msgstr "LibraryThing.com таймаут. Попробуйте позже."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
 msgid ""
@@ -1811,17 +1861,17 @@ msgstr "Обложка сохранена"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:187
 msgid "Set the subject tags"
-msgstr ""
+msgstr "Указать тэги темы"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:189
 msgid "Set the language"
-msgstr ""
+msgstr "Указать язык"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:193
 msgid "Set the ISBN"
-msgstr ""
+msgstr "Указать ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Ввести поле dc:language"
 
@@ -1835,69 +1885,75 @@ msgstr "Загрузка: rb-meta file.rb"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/from_any.py:55
 msgid "Creating Mobipocket file from EPUB..."
-msgstr ""
+msgstr "Создание Mobipocket файла из EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] myebook.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
-msgstr "Непосредственно MOBI HTML сохранен в"
+msgstr "Сырой MOBI HTML сохранен в"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:534
 msgid "Options to control the conversion to MOBI"
-msgstr ""
+msgstr "Опции управления конвертацией в MOBI"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:541
 msgid "Mobipocket-specific options."
-msgstr ""
+msgstr "Mobipocket-специфические опции."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:543
 msgid ""
 "Compress file text using PalmDOC compression. Results in smaller files, but "
 "takes a long time to run."
 msgstr ""
+"Сжимать текст файла, используя PalmDOC компрессию. Результирующие файлы "
+"меньше, но читаются дольше."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:546
 msgid "Modify images to meet Palm device size limitations."
-msgstr ""
+msgstr "Модифицировать картинки согласно ограничениям Palm."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:548
 msgid "Title for any generated in-line table of contents."
-msgstr ""
+msgstr "Заголовок для любых сгенерированных in-line оглавлений."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:554
 msgid ""
 "When present, use the author sorting information for generating the "
 "Mobipocket author metadata."
 msgstr ""
+"Если возможно, использовать информацию сортировки авторов для генерации "
+"метаданных по автору для Mobipocket."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:556
 msgid ""
 "Device renderer profiles. Affects conversion of font sizes, image rescaling "
 "and rasterization of tables. Valid profiles are: %s."
 msgstr ""
+"Профили рендерера устройства. Воздействует на размеры шрифта, картинки и "
+"растеризацию таблиц. Валидные профили: %s."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:561
 msgid "Source renderer profile. Default is %default."
-msgstr ""
+msgstr "Профиль исходного рендерера. По умолчанию %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:564
 msgid "Destination renderer profile. Default is %default."
-msgstr ""
+msgstr "Профиль выходного рендерера. По умолчанию %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:572
 msgid "[options]"
-msgstr ""
+msgstr "[options]"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:590
 msgid "Unknown source profile %r"
-msgstr ""
+msgstr "Неизвестный профиль источника %r"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:594
 msgid "Unknown destination profile %r"
-msgstr ""
+msgstr "Неизвестный выходной профиль %r"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:57
 msgid "The output directory. Defaults to the current directory."
@@ -1905,11 +1961,11 @@ msgstr "Директория результата. По умолчанию, те
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:822
 msgid "Cover"
-msgstr ""
+msgstr "Обложка"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:823
 msgid "Title Page"
-msgstr ""
+msgstr "Титульная страница"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:824
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:18
@@ -1920,85 +1976,87 @@ msgstr "Содержание"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:825
 msgid "Index"
-msgstr ""
+msgstr "Индекс"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:826
 msgid "Glossary"
-msgstr ""
+msgstr "Глоссарий"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:827
 msgid "Acknowledgements"
-msgstr ""
+msgstr "Подтверждения"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:828
 msgid "Bibliography"
-msgstr ""
+msgstr "Библиография"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:829
 msgid "Colophon"
-msgstr ""
+msgstr "Колофон"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:830
 msgid "Copyright"
-msgstr ""
+msgstr "Копирайт"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:831
 msgid "Dedication"
-msgstr ""
+msgstr "Посвящение"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:832
 msgid "Epigraph"
-msgstr ""
+msgstr "Эпиграф"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:833
 msgid "Foreword"
-msgstr ""
+msgstr "Предисловие"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:834
 msgid "List of Illustrations"
-msgstr ""
+msgstr "Список иллюстраций"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:835
 msgid "List of Tables"
-msgstr ""
+msgstr "Оглавление"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:836
 msgid "Notes"
-msgstr ""
+msgstr "Заметки"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:837
 msgid "Preface"
-msgstr ""
+msgstr "Введение"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:838
 msgid "Main Text"
-msgstr ""
+msgstr "Основной текст"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:13
 msgid "Options to control the transformation of pdf"
-msgstr ""
+msgstr "Опции контроля преобразования pdf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:24
 msgid "Number of pixels to crop from the left most x (default is %d) "
-msgstr ""
+msgstr "Количество пикселей обрезки слева по x (по умолчанию %d) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:26
 msgid "Number of pixels to crop from the left most y (default is %d) "
-msgstr ""
+msgstr "Количество пикселей обрезки слева по y (по умолчанию %d) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:28
 msgid "Number of pixels to crop from the right most x (default is %d) "
-msgstr ""
+msgstr "Количество пикселей обрезки справа по x (по умолчанию %d) "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:30
 msgid "Number of pixels to crop from the right most y (default is %d)"
-msgstr ""
+msgstr "Количество пикселей обрезки справа по y (по умолчанию %d)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:32
 msgid ""
 "A file generated by ghostscript which allows each page to be individually "
 "cropped [gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox > bounding] "
 msgstr ""
+"Файл, сгенерированный ghostscript, разрешающий каждой странице быть в "
+"отдельности обрезан [gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox > границей] "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:38
 msgid ""
@@ -2007,106 +2065,114 @@ msgid ""
 "\tCrops a pdf. \n"
 "\t"
 msgstr ""
+"\t%prog [options] file.pdf\n"
+"\n"
+"\tОбрезан в pdf. \n"
+"\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Часто используемая директория"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr "По умолчанию, отправлять файл в карту памяти, вместо основной памяти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr "Формат используется, когда сохраняется единственный файл на диск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Подтвердить перед удалением"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Размер иконок рабочей панели"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Показать название кнопок на рабочей панали"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Геометрия основного окна"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr "Сообщить, если доступна новая версия"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Использовать Римские цифры для нумерации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Сортировать список эпилогов по популярности"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Количество обложек показываемых в режиме просмотра обложек"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "По умолчанию преобразование в LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Опции для просмотра электронной книги LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
-msgstr "Этот формат просматривается используя встроенный просмотровщик"
+msgstr "Этот формат просматривается используя встроенный просмотрщик"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr "Показывать колонки в списке книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr "Автоматически запускать сервер конента при запуске приложения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "В базе данных содержатся старые новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Показывать иконку в панели задач"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Загрузить в устройство закаченные новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr "Удалить книги из библиотеки после загрузки в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
-msgstr ""
+msgstr "Показать обложку в отдельном окне вместо основного окна calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
-msgstr ""
+msgstr "Отключить уведомления от иконки в трее"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr "Действие по умолчанию по нажатию кнопки \"отправить в устройство\""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
-msgstr ""
+msgstr "%s добавлен в библиотеку"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:162
 msgid "Read metadata from "
-msgstr ""
+msgstr "Читать метаданные из "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:224
@@ -2125,62 +2191,205 @@ msgstr "Есть повторения!"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:146
 msgid "Adding books recursively..."
-msgstr ""
+msgstr "Добавить книги рекурсивно..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:147
 msgid "Searching for books in all sub-directories..."
-msgstr ""
+msgstr "Поиск книг во всех поддиректориях"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:176
 msgid "Adding books to database..."
-msgstr ""
+msgstr "Добавление книг в базу данных..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
-msgstr ""
+msgstr "Чтение метаданных..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:193
 msgid "Searching in"
-msgstr ""
+msgstr "Поиск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Устройство не подключено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Получить информацию о устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Получить список книг на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Отправить метаданные в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Загружено %d книг на устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Удалить книги из устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Загрузить книги из устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Смотреть книги на устройстве"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "и удалите из библиотеки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr "Установить действие по умолчанию для \"отправить в устройство\""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr "Отправить email"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Отправить в основную память"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Отправить в карту памяти"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr "Отослать определенный формат в устройство"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr "Отослать определенный формат на карточку"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr "Нет книг"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr "Отослать выбранное"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr "Выберите формат для отправки в устройство"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr "Нет устройства"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr "Устройство не подсоединено"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr "Нет карточки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Нет подходящего формата"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Отправляются новости на устройство."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Отправка книги в устройство"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Не могу загрузить книги на устройство, так как они не соответствуют формату: "
+"<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Нет места на устройстве"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Не могу загрузить книги на устройство из-за отсутствия свободной памяти. "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Путь"
@@ -2189,7 +2398,8 @@ msgstr "Путь"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2231,7 +2441,7 @@ msgstr "Установить конвертирование по умолчан
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
 msgid "Set options for converting %s"
-msgstr "Установить варианты для конвертации  %s"
+msgstr "Установить опции для конвертации  %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
@@ -2285,29 +2495,31 @@ msgstr "&Широкий"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
 msgid "Disable &Trimming"
-msgstr ""
+msgstr "Выключить обрезку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
+msgstr " плагинов"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Расширенный"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Общий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Расширенный"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2315,117 +2527,165 @@ msgstr ""
 "Сервер\n"
 "Контента"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
+msgstr "Плагины"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
-msgstr ""
+msgstr "Неверный путь к плагинам"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
-msgstr ""
+msgstr "%s - неверный путь к плагинам"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
-msgstr ""
+msgstr "Использовать плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
-msgstr ""
+msgstr "Плагин не может быть выключен"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
-msgstr ""
+msgstr "Плагин %s не может быть выключен"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
-msgstr ""
+msgstr "Плагин не настраиваемый"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
-msgstr ""
+msgstr "Плагин: %s не требует настройки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
-msgstr ""
+msgstr "Настройка %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
-msgstr ""
+msgstr "Не могу удалить встроеный плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
+" не может быть удален. Это встроенный плагин. Попробуйте отключить его."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Лог ошибок:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Лог доступа:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
-msgstr "Сбой запуска контент сервера"
+msgstr "Сбой запуска контент-сервера"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Неверный размер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Размер %s указан неверно. Должен быть задан в виде [ширина]x[высота]"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Неправильное расположение базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Должна быть дирректория."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Неправильное расположение базы данных "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Должна быть дирректория."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Неправильное расположение базы данных.<br>Немогу записать "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Сжатие базы данных. Это займет некоторое время."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Сжатие..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Сжатие базы данных. Это займет некоторое время."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr "&Расположение книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Просмотреть расположение новой базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2443,36 +2703,38 @@ msgstr "Просмотреть расположение новой базы да
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
-msgstr "Показать сообщение, если доступна &новая версия."
+msgstr "Сообщить, если доступна &новая версия."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
+"Выключение этих опций приводит к формированию метаданных из имени файла. Это "
+"конфигурируется в Advanced секции."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Читать &метаданные из файла"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Формат для единственного сохраненного файла:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "&Задержка сети по умолчанию:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2480,151 +2742,254 @@ msgstr ""
 "Установить задержку по умолчанию для сетевых вызовов (т.е. в любое время вы "
 "выходите в интернет для получения информации)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " секунд"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Выбрать &язык (необходим рестарт):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Обычный"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Высокий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Низкий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "&Приоритет задачи"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Добавить директорию в список часто используемых дерикторий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Удалить директорию из списка часто используемых дерикторий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Использовать &Римские цифры для нумерации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
-msgstr "использовать иконку в системной панеле (необходим рестарт)"
+msgstr "использовать иконку в трее (необходим перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
-msgstr ""
+msgstr "Показывать уведомления в трее"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
-msgstr ""
+msgstr "Показывать обложку в отдельном окне (нужен перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Отправлять автоматически закаченные новости в устройство для чтения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "Удалять новости из библиотеки после загрузки в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
+"Количество обложек показываемых в режиме просмотра (нужна перезагрузка "
+"calibre)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Панель инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Большой"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Средний"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Маленький"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Размер кнопок на панеле инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Показать надписи на кнопках панели инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Выбрать видимые &столбцы в просмотре библиотеки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
+msgstr "Использовать внутренний вьювер для:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "&Пользователь:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Пароль:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Свободное неиспользованное пространство из базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Упаковать базу данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Метаданные из файла"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 "calibre имеет сетевой сервер который позволяет предоставлять доступ к "
-"коллекции ваших книг, используя браузер где-угодно в мире. Различные "
-"изменения в настройках будут применены после рестарта сервера."
+"коллекции ваших книг, используя браузер где-угодно в мире. Любые изменения в "
+"настройках заработают после рестарта сервера."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "&Порт сервера:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "&Пользователь:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Пароль:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
-"Если вы оставили пароль чистым, кто-угодно получит доступ к вашим книгам "
-"использую веб-интерфейс."
+"Если вы оставили пароль пустым, кто угодно может получить доступ к вашим "
+"книгам используя веб-интерфейс."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Показать пароль"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2632,31 +2997,31 @@ msgstr ""
 "Максимальный размер ([ширина]x[высота]) обложек при отображении. Более "
 "крупные обложки подгоняются по размеру. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Макс. размер обложки:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "&Запустить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "Ост&ановить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Проверить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
-msgstr "Запустить сервер &автоматически после загрузки"
+msgstr "Запустить сервер авт&оматически после загрузки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Просмотреть логи &сервера"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2667,45 +3032,46 @@ msgstr ""
 "Если вы хотите использовать контент-сервер для доступа к своей библиотеке "
 "используя iPhone с установленной программой Stanza, вам надо добавить URL "
 "вида http://myhostname:8080/stanza, как новый каталог в Stanza. Где "
-"myhostname должен быть полное имя домена или IP адресс компьютера."
+"myhostname должен быть полное имя домена или IP-адрес компьютера."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
+"Здесь можно настроить поведение Calibre, указав какие плагины он использует."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
-msgstr ""
+msgstr "Включить/Выключить плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
-msgstr ""
+msgstr "Настроить плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
-msgstr ""
+msgstr "Удалить плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
-msgstr ""
+msgstr "Добавить новый плагин"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
-msgstr ""
+msgstr "Файл плагина:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
-msgstr ""
+msgstr "Добавить"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
-msgstr ""
+msgstr "Вы таки уверены?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
-msgstr ""
+msgstr "Показывать это предупреждение снова"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
@@ -2713,17 +3079,17 @@ msgstr "ОШИБКА"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:52
 msgid "Bulk convert to "
-msgstr ""
+msgstr "Конвертировать пачку в "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:54
 msgid "Convert %s to "
-msgstr ""
+msgstr "Конвертировать %s в "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Метаданные"
@@ -2755,11 +3121,15 @@ msgid ""
 "\n"
 "Metadata will be updated in the database as well as the generated %s file."
 msgstr ""
+"Указать метаданные такие, как as название и автор книги.\n"
+"\n"
+"Метаданные будут обновлены в базе данных так же как и в сгенеренном файле %s."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:98
 msgid ""
 "Adjust the look of the generated ebook by specifying things like font sizes."
 msgstr ""
+"Настроить фид генериреумой ebook указанием опция типа размера шрифта."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:99
 msgid "Specify the page layout settings like margins."
@@ -2777,26 +3147,26 @@ msgstr "Выбрать обложку "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Не читается"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "У вас нет разрешения на чтение этого файла: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Ошибка чтения файла"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Ошибка при чтении файла:<br /><b>"
 
@@ -2806,7 +3176,7 @@ msgid " is not a valid picture"
 msgstr " неверное изображение"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Не преобразуется"
 
@@ -2826,7 +3196,7 @@ msgstr "Не могу преобразовать %s, книга неизвест
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:253
 msgid "Choose the format to convert to "
-msgstr ""
+msgstr "Использовать формат для конвертирования "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:265
 msgid "Invalid XPath expression"
@@ -2856,7 +3226,7 @@ msgstr "Заменено изображение &обложки:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:498
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Browse for an image to use as the cover of this book."
-msgstr "Просматреть изображения для обложки этой книги."
+msgstr "Просмотреть изображения для обложки этой книги."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:472
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:500
@@ -2997,27 +3367,28 @@ msgstr "Зафиксировать структуру коментариев п
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:495
 msgid "&Rescale images"
-msgstr ""
+msgstr "Масштабировать картинки"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:496
 msgid "&Ignore tables"
-msgstr ""
+msgstr "Игнорировать таблицы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:497
 msgid "&Use author sort to set author field in output"
 msgstr ""
+"Использовать сортировку по автору для установки поля автор в выходном"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:498
 msgid "No text &justification"
-msgstr ""
+msgstr "Не выравнивать текст"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:499
 msgid "&Linearize tables"
-msgstr ""
+msgstr "Линеаризировать таблицы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:500
 msgid "Remove &first image from source file"
-msgstr ""
+msgstr "Удалить первую картинку из входного файла"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:501
 msgid "Override &CSS"
@@ -3025,11 +3396,11 @@ msgstr "Перезагрузить CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:503
 msgid "&Source profile:"
-msgstr ""
+msgstr "Входной профиль:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:504
 msgid "&Destination profile:"
-msgstr ""
+msgstr "Выходной профиль:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:505
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:541
@@ -3053,11 +3424,11 @@ msgstr "Нижняя Граница:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:513
 msgid "Do not &split on page breaks"
-msgstr ""
+msgstr "Не разделять по разрывам страниц"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:514
 msgid "&Page map"
-msgstr ""
+msgstr "Карта страниц"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:515
 msgid ""
@@ -3068,18 +3439,24 @@ msgid ""
 "pages in a paper book, to locations in the e-book. This controls where Adobe "
 "Digital Editions displays the page numbers in the right margin.</p>"
 msgstr ""
+"<p>Теперь Вы можете управлять тем, как calibre определяет границы страниц "
+"при помощи выражения XPath. Описание использования XPath на <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">XPath "
+"tutorial</a>. Границы страниц полезно определять когда Вы хотите выделить "
+"страницы бумажной книги для e-book. Это управляется элементами Adobe, "
+"Digital Editions с номерами страниц на правой границе.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:516
 msgid "&Boundary XPath:"
-msgstr ""
+msgstr "XPath границ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:517
 msgid "&Name XPath:"
-msgstr ""
+msgstr "Имя  XPath:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:518
 msgid "Automatic &chapter detection"
-msgstr "Автомотическое определение глав"
+msgstr "Автоматическое определение глав"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:519
 msgid ""
@@ -3088,6 +3465,10 @@ msgid ""
 "href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">XPath "
 "tutorial</a></p>"
 msgstr ""
+"<p>Вы можете управлять как calibre находит главы при помощи XPath. Описание "
+"использования XPath на <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/xpath.html\">XPath "
+"tutorial</a></p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:520
 msgid "&XPath:"
@@ -3127,57 +3508,61 @@ msgstr "Уровень &2 TOC"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:529
 msgid "&Title for generated TOC"
-msgstr ""
+msgstr "&Заголовок доя оглавления"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:530
 msgid "Level &3 TOC"
-msgstr ""
+msgstr "Уровень 3 оглавления"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Сортировка по Автору"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Нет подключения"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr "Поиск матаданных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Вы должны ввести правильный пароль доступа для isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr "Не могу найти матаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Ошибка получения метаданных"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr "Загрузка метаданных похоже остановилась. Попробуйте позже."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr "Не могу извлечь метаданные из:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Нет метаданных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Нет метаданных, попробуйте откорректировать заглавие и автора или ISBN ключ."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Получение метаданных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Получение метаданных для <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Зайти под гостевым именем в <a href=\"http://www.isbndb.com\">ISBNdb.com</a> "
-"для получения пароля доступа."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3232,7 +3617,7 @@ msgstr "Выставить параметры преобразования"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:258
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:341
 msgid "No preprocessing"
-msgstr ""
+msgstr "Не предобрабатывать"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:261
 msgid ""
@@ -3329,7 +3714,7 @@ msgstr "Пробел между словами"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:529
 msgid "Enable auto &rotation of images"
-msgstr "Использовать автомотическое разворачивание картинки"
+msgstr "Использовать автоматический поворот картинки"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:530
 msgid "Insert &blank lines between paragraphs"
@@ -3371,7 +3756,7 @@ msgstr " пикс."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:538
 msgid "Header &separation:"
-msgstr ""
+msgstr "Разделитель заголовка:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:539
 msgid "Override<br>CSS"
@@ -3503,7 +3888,7 @@ msgstr "Открыть редактор описания"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
-msgstr "Удалить описание:"
+msgstr "Удалить тэги:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
@@ -3511,39 +3896,39 @@ msgstr "Запятая разделяет список описаний удал
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
-msgstr "Формат удаления:"
+msgstr "Удалить формат:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
 msgid "A&utomatically set author sort"
 msgstr "Автоматически выставить сортировку по автору"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
-msgid "No format selected"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
-msgid "Could not read metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
-msgid "Could not read metadata from %s format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
-msgid "Could not read cover"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
+msgid "No format selected"
+msgstr "Не выбран формат"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
+msgid "Could not read metadata"
+msgstr "Не могу прочесть метаданные"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
+msgid "Could not read metadata from %s format"
+msgstr "Не могу прочесть метаданные из %s формата"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
+msgid "Could not read cover"
+msgstr "Не могу прочитать обложку"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
-msgstr ""
+msgstr "Не могу прочитать обложку из %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
-msgstr ""
+msgstr "Обложка в формате %s неправильная"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3553,26 +3938,44 @@ msgstr ""
 "<br/>Если Вы их не имеете, выможете бесплатно <a "
 "href='http://www.librarything.com'>зарегистрироваться</a>.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
+msgstr "Загрузка обложки..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Не могу получить обложку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Вы должны назначить ISBN идентификатор для этой книги"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Не могу получить обложку.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Вы должны назначить ISBN идентификатор для этой книги"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr "Плохая обложка"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr "Обложка с неправильной картинкой"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3599,7 +4002,7 @@ msgstr "ISBN"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
 msgid "&Fetch metadata from server"
-msgstr ""
+msgstr "Доставить метаданные с сервера"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
 msgid "Available Formats"
@@ -3615,7 +4018,7 @@ msgstr "Удалить выбранные форматы книги из баз
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 msgid "Set the cover for the book from the selected format"
-msgstr ""
+msgstr "Установить обложку выбранного формата"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
 msgid "Reset cover to default"
@@ -3623,7 +4026,7 @@ msgstr "Сбросить обложку на \"по умолчанию\""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid "Fetch &cover image from server"
-msgstr ""
+msgstr "Доставить обложку с сервера"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
 msgid ""
@@ -3633,7 +4036,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 msgid "Change &password"
-msgstr ""
+msgstr "Сменить пароль"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
 msgid "Password needed"
@@ -3641,7 +4044,7 @@ msgstr "Необходим пароль"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:43
 msgid "Aborting..."
-msgstr ""
+msgstr "Отмена..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:40
 msgid "You"
@@ -3654,84 +4057,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
-msgstr ""
+msgstr "Запланированно"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Найти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d набор параметров"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
-msgstr ""
+msgstr "Понедельник"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
-msgstr ""
+msgstr "Среда"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
-msgstr ""
+msgstr "день"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
-msgstr ""
+msgstr "Пятница"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
-msgstr ""
+msgstr "Суббота"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
-msgstr ""
+msgstr "Воскресенье"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
-msgstr ""
+msgstr "Четверг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr "Вы должны ввести свои логин и пароль"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr "Параметру требуется логин и пароль"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Создано: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
-msgid "%d days, %d hours and %d minutes ago"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
-msgid "Last downloaded"
-msgstr ""
+msgid "%d days, %d hours and %d minutes ago"
+msgstr "%d дней, %d часов и %d минут назад"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+msgid "Last downloaded"
+msgstr "Последняя закачка"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Последняя закачка: никогда"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Загрузка новостей по расписанию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Добавить нужный источник новостей"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3750,20 +4154,20 @@ msgstr "Загрузка по времени"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:165
 msgid "blurb"
-msgstr ""
+msgstr "объявление"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:166
 msgid "&Schedule for download:"
-msgstr ""
+msgstr "Запланировано для загрузки:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:169
 msgid "Every "
-msgstr ""
+msgstr "Каждый "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:168
 msgid "at"
-msgstr ""
+msgstr "в"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:170
 msgid ""
@@ -3785,7 +4189,7 @@ msgstr "&Учётная запись"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:176
 msgid "For the scheduling to work, you must leave calibre running."
-msgstr "Для работы по рассписанию, вы должны загрузить calibre."
+msgstr "Для работы по расписанию, вы должны оставить calibre запущенным."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:177
 msgid "&Download now"
@@ -4125,6 +4529,26 @@ msgid ""
 "expression on a few sample filenames. The group names for the various "
 "metadata entries are documented in tooltips.</p></body></html>"
 msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Установите регулярное "
+"выражение для попытки сформировать матаданные из имени файла. </p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><a "
+"href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+"decoration: underline; color:#0000ff;\">ссылка</span></a> на синтакс "
+"регульяного выражения.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Используйте <span style=\" "
+"font-weight:600;\">Test</span> область для проверки Вашего регулярного "
+"выражения на примерах. Имена параметров элементов регулярных выражений "
+"описаны во всплывающих подсказках.</p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:104
 msgid "Regular &expression"
@@ -4155,11 +4579,11 @@ msgstr "Обычный параметр (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Нет совпадений"
 
@@ -4244,51 +4668,57 @@ msgstr "Немогу удалить задание при подключенно
 msgid "Job has already run"
 msgstr "Задание уже запущено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Размер (МБ)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Дата"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Ничего"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Книга <font face=\"serif\">%s</font> из %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
-msgstr ""
+msgstr "Запрещено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
+"Сброс на устройство не поддерживается. Сначала добавьте книгу в библиотеку "
+"calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Формат"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Поиск (для расширенного поиска нажмите кнопку слева)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
-msgstr "Настройка просматровщика"
+msgstr "Настройка просмотрщика"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
@@ -4304,20 +4734,20 @@ msgstr "<b>Изменения применятся только после пе
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:64
 msgid " - LRF Viewer"
-msgstr " - LRF просмотровщик"
+msgstr " - LRF просмотрщик"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
 msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Нет совпадений</b> для искомой фразы <i>%s</i> ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Совпадений не найдено"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
-msgstr "LRF просмотровщик"
+msgstr "LRF просмотрщик"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
@@ -4358,23 +4788,23 @@ msgstr "Открыть книгу"
 msgid "Configure"
 msgstr "Настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Ошибка подключения с устройством"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "Восстановить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
-msgstr ""
+msgstr "Пожертвовать на развитие calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Перезапуск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4382,126 +4812,112 @@ msgstr ""
 "<p>Для справки посетите <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Отправить в основную память"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Отправить в карту памяти"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "и удалите из библиотеки"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "По умолчанию отправлять в карту памяти"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Редактировать метаданные индивидуально"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Редактировать основные метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Добавить книги из одной директории"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
+"Добавить книги из директорий, включая поддиректории (одна книга на "
+"директорию, считая, что каждый файл в директории - та же самая книга в "
+"разных форматах)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
+"Добавить книги из директорий, включая поддиректории (одна книга на "
+"директорию, считая, что каждый файл - отдельная книга)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Сохранить на диск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Сохранить на диск в одну директорию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Сохранять на диск только формат %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Вид"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Просмотреть особый формат"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Индивидуальное преобразование"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Общее преобразование"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Настройки по умолчанию для преобразования"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Настройки по умолчанию для преобразования комиксов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
-msgstr ""
+msgstr "Похожие книги..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Плохое расположение базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
-msgstr "Выбререте расположение Вашей библиотеки электронных книг."
+msgstr "Выбрите расположение Вашей библиотеки электронных книг."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
-msgstr ""
+msgstr "Просмотр по обложкам"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Устройство: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " определено."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Подключено "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "База данных устройства неисправна"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4521,9 +4937,9 @@ msgstr ""
 "следующее:\n"
 "                <ol>\n"
 "                <li>Отключите устройство. Дождитесь завершения  создания "
-"базы данных (т.е. дождисеь ее готовности к использованию). Подключите "
+"базы данных (т.е. дождитесь ее готовности к использованию). Подключите "
 "устройство. Теперь должно все заработать в приложении %(apps)s. Если этого "
-"не произошло переходите к следующему пункту.</li>\n"
+"не произошло, то переходите к следующему пункту.</li>\n"
 "                <li>Закройте %(app)s приложение. Найдите файл media.xml в "
 "основной памяти устройства. Удалите его. Отключите устройство. Подождите "
 "создания файла. Подключите устройство снова и запустите приложение "
@@ -4531,192 +4947,160 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Загрузка книг в устройство."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "Книги EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "Книги LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "Книги HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "Книги LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "Книги MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "Текстовые книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "Книги PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Комиксы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Архивы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
-msgstr ""
+msgstr "Добавление книг..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Нет места на устройстве"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>Немогу загрузить книги на устройство, из-за отсутствия свободной памяти. "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
+"Выбранные книги будут <b>навсегда удалены</b> вместе с файлами с Вашего "
+"компьютера. Вы уверены?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Удаляются книги из устройства."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Невозможно редактировать метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Нет Выбранных книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Отправляются новости на устройство."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Отправка книги в устройство"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Нет подходящего формата"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"Не могу загрузить книги на устройство, так как они не соответствуют формату: "
-"<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Невозможно сохранить на диск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
-msgstr ""
+msgstr "Сохранение на диск..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
-msgstr ""
+msgstr "Сохранено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Выберете директорию получателя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
-"<p>Не могу сохранить гники на диск потому, что формат %s не доступен для:<ul>"
+"<p>Не могу сохранить книги на диск потому, что формат %s не доступен для:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Не могу сохранить некоторые книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Вызвать новость из "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr " загружено."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Нет выбранных книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Невозможно просмотреть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Выберете для просмотра формат"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "Не могу открыть папку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s неизвестный формат."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Невозможно настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Пока запущено задание, не могу настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Копирование базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Копирование библиотеки в "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Неверная база данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4724,253 +5108,267 @@ msgstr ""
 "<p>Уже используется неправильная база данных %s, удалите ее прежде, чем "
 "перенести используемую. <br>Ошибка: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Невозможно перенести базу данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Нет доступной подробной информации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr "Не доступна подробная информация книг на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Ошибка согласования устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
-"Была временная ощибка общения с устройством. Пожалуста, переподключите "
+"Была временная ошибка общения с устройством. Пожалуста, переподключите "
 "устройство или перегрузите его."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Ошибка преобразования"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 "<p>Не могу преобразовать: %s<p>Это <a href=\"%s\">DRM</a> книга. Перед "
-"преобразование удалите DRM используя программное обеспечение."
+"преобразованием удалите DRM используя соответствующее ПО."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
-msgstr ""
+msgstr "Неверное расположение библиотеки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
-msgstr ""
+msgstr "Нет доступа к %s. Использование %s в качестве библиотеки."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
+"является результато труда многих добровольцев по всему миру. Если Вы сочли "
+"его полезным, будьте добры пожертвовать на его развитие."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
-msgstr "Имеется активное задание. Вы всеравно хотите выйти?"
+msgstr "Имеется активное задание. Вы все равно хотите выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
+" соединяется с устройством!<br>\n"
+"                      'Выход может повредить устройство.<br>\n"
+"                      'Желаете выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Активное задание"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Активные задания"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
+"продолжит работать в трее. Для завершения работы выберите<b>Quit</b> в "
+"контекстном меню трея."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
+"<span style=\"color:red; font-weight:bold\">Последняя версия: <a "
+"href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Доступно обновление"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
+"%s has been updated to version %s. See the <a "
+"href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">новые возможности</a>. "
+"Посетить страницу?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Доступно обновление"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
-msgstr ""
+msgstr "Использовать библиотеку по указанному пути."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
-msgstr ""
+msgstr "Старт минимизированным в трей"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
-msgstr ""
+msgstr "Выводить отладочную информацию на консоль"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
-msgstr ""
+msgstr "Вывод:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
+"Установить формат вывода который используется для конвертирования  ebooks и "
+"загрузки новостей"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Расширенный поиск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Поиск:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
+"Использовать список книг по названию или автору<br><br>Слова разделены "
+"пробелами и объединены AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
+"Использовать список книг по названию, автору, издателю, тэгам и "
+"комментариям<br><br>Слова разделены пробелами и объединены AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Сброс быстрого поиска"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Сравнить некоторые"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Сравнить все"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Сортировать по &популярности"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Добавить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Удалить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Редактировать мета информацию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Отправить в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Скачать новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
-msgstr ""
+msgstr "Конвертировать"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
-msgstr ""
+msgstr "Открыть папку"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+msgid "Show book details"
+msgstr "Показать подробности"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+msgid "Books by same author"
+msgstr "Книги этого же автора"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
-msgid "Show book details"
-msgstr ""
+msgid "Books in this series"
+msgstr "Книги той же серии"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
-msgid "Books by same author"
-msgstr ""
+msgid "Books by this publisher"
+msgstr "Книги того же издателя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
-msgid "Books in this series"
-msgstr ""
+msgid "Books with the same tags"
+msgstr "Книги с теми же тэгами"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
-msgid "Books by this publisher"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
-msgid "Books with the same tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Настройки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
-msgstr ""
+msgstr "Конфигурация Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4979,10 +5377,13 @@ 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 ""
+"Перенаправить консольный вывод в диалоговое окошко (и stdout и "
+"stderr).Полезно для windows, где графические приложения не имеют потоков "
+"вывода."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:57
 msgid "&Preferences"
-msgstr ""
+msgstr "&Параметры"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:58
 msgid "&Quit"
@@ -4998,25 +5399,27 @@ msgstr "Работа:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
-msgstr ""
+msgstr "Кликнуть для просмотра списка активных задач"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
 msgid "Click to browse books by their covers"
-msgstr ""
+msgstr "Кликнуть для просмотра книг по обложкам"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
 msgid "Click to turn off Cover Browsing"
-msgstr ""
+msgstr "Кликнуть для выключения просмотра книг по обложкам"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
+"<p>Просмотра книг по обложкам выключен.<br>Импорт модуля pictureflow "
+"неудачен:<br>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:167
 msgid "Click to browse books by tags"
-msgstr ""
+msgstr "Кликнуть просмотра книг по тэгам"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Authors"
@@ -5029,24 +5432,24 @@ msgstr "Публикация"
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:117
 msgid "Convert book: "
-msgstr ""
+msgstr "Конвертировать книгу: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:151
 msgid "Convert comic: "
-msgstr ""
+msgstr "Конвертировать комикс: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:173
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:267
 msgid "Starting Bulk conversion of %d books"
-msgstr ""
+msgstr "Старт Конвертации пачки из %d книг"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:210
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:238
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:307
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:335
 msgid "Convert book %d of %d (%s)"
-msgstr ""
+msgstr "Конвертация книги %d из %d (%s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:247
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:344
@@ -5054,11 +5457,13 @@ msgid ""
 "<p>Could not convert %d of %d books, because no suitable source format was "
 "found.<ul>%s</ul>"
 msgstr ""
+"<p>Не могу конвертировать %d из %d книг - неподходящий формат "
+"источника.<ul>%s</ul>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:248
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:345
 msgid "Could not convert some books"
-msgstr ""
+msgstr "Не могу конвертировать некоторые книги"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:387
@@ -5071,7 +5476,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:101
 msgid "Configure Ebook viewer"
-msgstr ""
+msgstr "Конфигурация вьювера Ebook"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:102
 msgid "&Font options"
@@ -5079,15 +5484,15 @@ msgstr "&Опции шрифта"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:103
 msgid "Se&rif family:"
-msgstr ""
+msgstr "Cемейство Se&rif:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:104
 msgid "&Sans family:"
-msgstr ""
+msgstr "Cемейство &Sans:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:105
 msgid "&Monospace family:"
-msgstr ""
+msgstr "Cемейство &Monospace:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:106
 msgid "&Default font size:"
@@ -5099,7 +5504,7 @@ msgstr "Monospace &размер шрифта:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:110
 msgid "S&tandard font:"
-msgstr ""
+msgstr "С&тандартный шрифт:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:111
 msgid "Serif"
@@ -5119,7 +5524,7 @@ msgstr "Пользовательский стиль"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:50
 msgid "Options to customize the ebook viewer"
-msgstr ""
+msgstr "Опции настроек ebook вьювера"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:86
@@ -5127,6 +5532,7 @@ msgid ""
 "Set the user CSS stylesheet. This can be used to customize the look of all "
 "books."
 msgstr ""
+"Настройка CSS. Может быть использовано для изменения вида всем книгам."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "Font options"
@@ -5138,7 +5544,7 @@ msgstr "Шрифты семейства serif"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:63
 msgid "The sans-serif font family"
-msgstr ""
+msgstr "Шрифты семейства sans-serif"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:65
 msgid "The monospaced font family"
@@ -5146,107 +5552,112 @@ msgstr "Шрифты семейства monospaced"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:66
 msgid "The standard font size in px"
-msgstr ""
+msgstr "Размер Стандартного шрифта в px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:67
 msgid "The monospaced font size in px"
-msgstr ""
+msgstr "Размер Моноширного шрифта в px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:68
 msgid "The standard font type"
 msgstr "Стандартный шрифт"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Перейти..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Позиция в книге"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Неизвестное"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
+"Идти по ссылке. Для получения номеров ссылок используйте ссылочный режим."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
-msgstr ""
+msgstr "Поиск текста в книге"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "Выбрать электронную книгу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "Электронная книга"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Добавить закладку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
-msgstr ""
+msgstr "Введите название закладки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr "Нет соответствий для: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "Загрузить поток..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr "Разметка %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "Загружается электронная книга..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
-msgstr ""
+msgstr "<p>Книга защищена <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "Ошибка DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "Не могу открыть электронную книгу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
-msgstr ""
+msgstr "Опции управления ebook вьювером"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
+"%prog [options] файл\n"
+"\n"
+"Просм. ebook.  \n"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
-msgstr ""
+msgstr "Ebook вьювер"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
-msgstr ""
+msgstr "Тулбар"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
@@ -5282,82 +5693,92 @@ msgstr "Закладка"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
 msgid "Toggle full screen"
-msgstr ""
+msgstr "В полный экран"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Неправильное регулярное выражение"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Неправильное регулярное выражение: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
+"Библиотека\n"
+"%d\n"
+"книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
+"Ридер\n"
+"%s\n"
+"доступно"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
+"Карточка\n"
+"%s\n"
+"доступно"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
-msgstr ""
+msgstr "Кликните чтобы посмотреть список книг на Вашем компьютере"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
-msgstr ""
+msgstr "Кликните чтобы посмотреть список книг на Вашем ридере"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
-msgstr ""
+msgstr "Кликните чтобы посмотреть список книг на карточке"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
 msgid "Settings to control the calibre content server"
-msgstr ""
+msgstr "Установки управления сервером calibre"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
 msgid "The port on which to listen. Default is %default"
-msgstr ""
+msgstr "Порт. По умолчанию %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:22
 msgid "The server timeout in seconds. Default is %default"
-msgstr ""
+msgstr "Таймаут в секундах. По умолчанию %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
 msgid "The max number of worker threads to use. Default is %default"
-msgstr ""
+msgstr "Максимальное количество используемых нитей. По умолчанию %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
 msgid "Set a password to restrict access. By default access is unrestricted."
-msgstr ""
+msgstr "Пароль ограниченного доступа. По умолчанию доступ неограничен."
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:28
 msgid "Username for access. By default, it is: %default"
-msgstr ""
+msgstr "Имя пользователя. По умолчанию: %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
 msgid "The maximum size for displayed covers. Default is %default."
-msgstr ""
+msgstr "Максимальный размер демонстрируемой обложки. По умолчанию: %default"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:107
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
+"Путь к библиотеки Calibre. По умолчаниюиспользовать путь в установках."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:187
 msgid ""
@@ -5365,6 +5786,9 @@ msgid ""
 "\n"
 "List the books available in the calibre database.\n"
 msgstr ""
+"%prog список [options]\n"
+"\n"
+"Список книг в базе данных Calibre.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:195
 msgid ""
@@ -5374,6 +5798,11 @@ msgid ""
 "Default: %%default. The special field \"all\" can be used to select all "
 "fields. Only has effect in the text output format."
 msgstr ""
+"Поля для показа в списке книг базы данных. Состоит из полей, разделенных "
+"запятой.\n"
+"Доступные поля: %s\n"
+"По умолчанию: %%default. Спецполе \"all\" можно использовать для выбора всех "
+"полей. Эффективно только для текстового формата."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:197
 msgid ""
@@ -5381,10 +5810,13 @@ msgid ""
 "Available fields: %s\n"
 "Default: %%default"
 msgstr ""
+"Поле, по которому будет отсортирован результат.\n"
+"Доступные поля: %s\n"
+"По умолчанию: %%default"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:199
 msgid "Sort results in ascending order"
-msgstr ""
+msgstr "Сортировать по убыванию"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:201
 msgid ""
@@ -5392,28 +5824,33 @@ msgid ""
 "please see the search related documentation in the User Manual. Default is "
 "to do no filtering."
 msgstr ""
+"Фильтровать результаты запроса. С форматом запроса можно ознакомиться в "
+"соответствующей документации в руководстве пользователя. По умолчанию не "
+"фильтровать."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:203
 msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
-msgstr ""
+msgstr "Максимальная ширина вывода. По умолчанию размер экрана."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:204
 msgid "The string used to separate fields. Default is a space."
-msgstr ""
+msgstr "Разделитель полей. По умолчанию пробел."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:205
 msgid ""
 "The prefix for all file paths. Default is the absolute path to the library "
 "folder."
 msgstr ""
+"Префикс для всех путей. По умолчанию это абсолютный путь к директории "
+"библиотеки."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:208
 msgid ""
 "The format in which to output the data. Available choices: %s. Defaults is "
 "text."
-msgstr ""
+msgstr "Формат вывода данных. Возможный выбор: %s. По умолчанию text."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:216
 msgid "Invalid fields. Available fields:"
@@ -5421,13 +5858,15 @@ msgstr "Неправильное поле. Доступное поле:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:223
 msgid "Invalid sort field. Available fields:"
-msgstr ""
+msgstr "Неправильное поле сортировки. Доступные поля:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:294
 msgid ""
 "The following books were not added as they already exist in the database "
 "(see --duplicates option):"
 msgstr ""
+"Следующие книги не добавлены, поскольку они уже есть в базе данных (см. "
+"опцию --duplicates):"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:320
 msgid ""
@@ -5437,22 +5876,31 @@ msgid ""
 "directories, see\n"
 "the directory related options below.\n"
 msgstr ""
+"%prog добавл. [options] file1 file2 file3 ...\n"
+"\n"
+"Добавить указанные файлы как книги в базу данных. Вы можете так же указать "
+"директории, смотри\n"
+"опции директории ниже.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 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 ""
+"Считать, что в каждой директории есть только одна логическая книга в "
+"различных e-book форматах"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:331
 msgid "Process directories recursively"
-msgstr ""
+msgstr "Обрабатывать рекурсивно"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:333
 msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
 msgstr ""
+"Добавлять книгу в базу данных даже если она уже есть. Сравнение основано на "
+"названиях книг."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:338
 msgid "You must specify at least one file to add"
@@ -5466,6 +5914,11 @@ msgid ""
 "separated list of id numbers (you can get id numbers by using the list "
 "command). For example, 23,34,57-85\n"
 msgstr ""
+"%prog удаление по ids\n"
+"\n"
+"Удаление книг по ids из базы данных. ids должны быть списком разделеных "
+"запятой номеров id (id номера можно получить командой list ). Например, "
+"23,34,57-85\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:368
 msgid "You must specify at least one book to remove"
@@ -5479,6 +5932,11 @@ msgid ""
 "identified by id. You can get id by using the list command. If the format "
 "already exists, it is replaced.\n"
 msgstr ""
+"%prog add_format [options] id ebook_file\n"
+"\n"
+"Добавить ebook в ebook_file в одном из доступных для logical book форматов, "
+"ebook идентифецирована по id. id можно получить командой list. Если книга в "
+"данном формате уже есть, она будет заменена.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:399
 msgid "You must specify an id and an ebook file"
@@ -5497,6 +5955,12 @@ msgid ""
 "by using the list command. fmt should be a file extension like LRF or TXT or "
 "EPUB. If the logical book does not have fmt available, do nothing.\n"
 msgstr ""
+"\n"
+"%prog remove_format [options] id fmt\n"
+"\n"
+"Удалить формат fmt из logical book, идентифецированной по id. Вы можее "
+"получить id используя команду list. fmt это расширения файла LRF или TXT или "
+"EPUB. Если logical book не имеет нужного fmt, ничего не произойдет.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:425
 msgid "You must specify an id and a format"
@@ -5511,6 +5975,11 @@ msgid ""
 "id.\n"
 "id is an id number from the list command.\n"
 msgstr ""
+"\n"
+"%prog show_metadata [options] id\n"
+"\n"
+"Показать метаданные из базы данных calibre для книги с id.\n"
+"id это номер из команды list.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:451
 msgid "Print metadata in OPF form (XML)"
@@ -5532,6 +6001,13 @@ msgid ""
 "can get a quick feel for the OPF format by using the --as-opf switch to the\n"
 "show_metadata command.\n"
 msgstr ""
+"\n"
+"%prog set_metadata [options] id /path/to/metadata.opf\n"
+"\n"
+"Установить метаданные из базы данных calibre для книги с id.\n"
+"из файла OPF metadata.opf. id это номер из команды list. Вы\n"
+"можете быстро заполнить OPF формат используя --as-opf опцию для\n"
+"команды show_metadata.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:483
 msgid "You must specify an id and a metadata file"
@@ -5547,6 +6023,12 @@ msgid ""
 "(in\n"
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
+"%prog экспорт [options] id\n"
+"\n"
+"Экспортировать книги по id (список, разделенный запятыми ) в файловую "
+"систему.\n"
+"Операция экспорта сохраняет все форматы книги, ее обложку и метаданные (в\n"
+"opf файле). id можно получить командой list.\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:503
 msgid "Export all books in database, ignoring the list of ids."
@@ -5562,11 +6044,11 @@ msgstr "Экспортировать все книги в одну деррик
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:509
 msgid "Create file names as author - title instead of title - author"
-msgstr ""
+msgstr "Имена файлов автор - имя книги, а не имя книги - автор"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:514
 msgid "You must specify some ids or the %s option"
-msgstr ""
+msgstr "Вы должны указать id или опцию %s"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:524
 msgid ""
@@ -5579,27 +6061,35 @@ msgid ""
 "\n"
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
+"%%prog команда [options] [arguments]\n"
+"\n"
+"%%prog интерфейс командной строки лоя базы данных calibre.\n"
+"\n"
+"команда одна из:\n"
+"  %s\n"
+"\n"
+"Для справки: %%prog команда --help\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Copying books to %s<br><center>"
-msgstr ""
+msgstr "<p>Копирование книг в %s<br><center>"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1252
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1361
 msgid "Copying <b>%s</b>"
-msgstr ""
+msgstr "Копирование <b>%s</b>"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1332
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
-msgstr ""
+msgstr "<p>Миграция старой базы данных в %s<br><center>"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1378
 msgid "Compacting database"
-msgstr ""
+msgstr "Сжатие базы данных"
 
 #: /home/kovid/work/calibre/src/calibre/library/server.py:141
 msgid "Password to access your calibre library. Username is "
-msgstr ""
+msgstr "Пароль для доступа в библиотеку. Имя пользователя "
 
 #: /home/kovid/work/calibre/src/calibre/library/server.py:401
 msgid ""
@@ -5607,14 +6097,17 @@ msgid ""
 "\n"
 "Start the calibre content server."
 msgstr ""
+"[options]\n"
+"\n"
+"Запуск calibre content server."
 
 #: /home/kovid/work/calibre/src/calibre/parallel.py:388
 msgid "Could not launch worker process."
-msgstr ""
+msgstr "Не могу запустить рабочий процесс."
 
 #: /home/kovid/work/calibre/src/calibre/parallel.py:814
 msgid "Job stopped by user"
-msgstr ""
+msgstr "Задача остановлена пользователем"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:43
 msgid "%sUsage%s: %s\n"
@@ -5626,23 +6119,23 @@ msgstr "Создано "
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:536
 msgid "Path to the database in which books are stored"
-msgstr ""
+msgstr "Пудь к базе данных в которой хранятся книги"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:538
 msgid "Pattern to guess metadata from filenames"
-msgstr ""
+msgstr "Шаблон для получения метаданных из имени файла"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:540
 msgid "Access key for isbndb.com"
-msgstr ""
+msgstr "Ключ доступа к isbndb.com"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:542
 msgid "Default timeout for network operations (seconds)"
-msgstr ""
+msgstr "Таймаут для сетевых операций по умолчанию (сек)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:544
 msgid "Path to directory in which your library of books is stored"
-msgstr ""
+msgstr "Пудь к директории в которой хранятся книги"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:546
 msgid "The language in which to display the user interface"
@@ -5654,32 +6147,36 @@ msgstr "Формат книги по умолчанию после преобр
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:550
 msgid "Read metadata from files"
-msgstr ""
+msgstr "Читать метаданные из файлов"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:552
 msgid "The priority of worker processes"
-msgstr ""
+msgstr "Приоритет рабочих процессов"
 
 #: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:180
 msgid "Could not initialize the fontconfig library"
-msgstr ""
+msgstr "Не могу инициалиализировать библиотеку fontconfig"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
-msgstr ""
+msgstr "URL должен быть sftp scheme"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
-msgstr ""
+msgstr "хост доллжен быть задан в форме user@hostname"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
-msgstr ""
+msgstr "Проблемы с открытием SSH сессии: "
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr "Ошибка авторизации на сервере: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5692,11 +6189,11 @@ msgstr "Безымянная статья"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:15
 msgid "Options to control the fetching of periodical content from the web."
-msgstr ""
+msgstr "Опции контроля доставки контента (периодика) из Инета."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:18
 msgid "Customize the download engine"
-msgstr ""
+msgstr "Настройка механизма загрузок"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:460
@@ -5765,28 +6262,33 @@ msgid ""
 "If you specify this option, any argument to %prog is ignored and a default "
 "recipe is used to download the feeds."
 msgstr ""
+"Указать список для загрузки. К примеру: \n"
+"\"['http://feeds.newsweek.com/newsweek/TopNews', "
+"'http://feeds.newsweek.com/headlines/politics']\"\n"
+"Если эта опция указана, любые аргументы %prog игнорируются и для загрузки "
+"используется механизм по умолчанию ."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:37
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:94
 msgid "Be more verbose while processing."
-msgstr ""
+msgstr "Показать больше подробностей."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:39
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:96
 msgid ""
 "The title for this recipe. Used as the title for any ebooks created from the "
 "downloaded feeds."
-msgstr ""
+msgstr "Заголовок. Используется для любых книг, созданных из этой загрузки."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:41
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:97
 msgid "Username for sites that require a login to access content."
-msgstr ""
+msgstr "Имя пользователя для сайтов, которые в этом нуждаются."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:43
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:98
 msgid "Password for sites that require a login to access content."
-msgstr ""
+msgstr "Пароль для сайтов, которые в этом нуждаются."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:51
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:101
@@ -5794,6 +6296,8 @@ msgid ""
 "Number of levels of links to follow on webpages that are linked to from "
 "feeds. Defaul %default"
 msgstr ""
+"Количество уровней для следования по линкам с загружаемых страниц. По "
+"умолчанию %default"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:53
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:103
@@ -5801,6 +6305,7 @@ msgid ""
 "The directory in which to store the downloaded feeds. Defaults to the "
 "current directory."
 msgstr ""
+"Директория в которой хранится загружаемые данные. По умолчанию текущая."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:55
 msgid "Don't show the progress bar"
@@ -5955,34 +6460,41 @@ msgstr "Ошибка загрузки статьи: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Достаавляется материал"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Хорватский"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Сербский"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6030,7 +6542,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6080,73 +6592,81 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_xkcd.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zdnet.py:17
 msgid "English"
-msgstr ""
+msgstr "Английский"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Испанский"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
-msgstr ""
+msgstr "Французский"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_de_standaard.py:12
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_demorgen_be.py:16
 msgid "Dutch"
+msgstr "Голландский"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
 msgid "Portugese"
-msgstr ""
+msgstr "Португальский"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_faznet.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
 msgid "German"
-msgstr ""
+msgstr "Неметский"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:12
 msgid "Kovid Goyal"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
+msgstr "Ковид Гоял"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
-msgstr ""
+msgstr "Итальянский"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:83
 msgid "Skipping duplicated article: %s"
-msgstr ""
+msgstr "Пропуск статей-дублей: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:88
 msgid "Skipping filtered article: %s"
-msgstr ""
+msgstr "Пропуск отфильтрованных статей: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
@@ -6189,6 +6709,22 @@ msgstr "Показать детальную информацию. Использ
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "&Очередность работ преобразования:"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Нет подключения"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Вы должны ввести правильный пароль доступа для isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Получение метаданных для <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Зайти под гостевым именем в <a href=\"http://www.isbndb.com\">ISBNdb.com</a> "
+#~ "для получения пароля доступа."
+
 #~ msgid "Options"
 #~ msgstr "Параметры"
 
@@ -6257,6 +6793,12 @@ msgstr "Показать детальную информацию. Использ
 #~ "тегами заголовков с атрибутом class=\"chapter\" необходим использовать \"h\\"
 #~ "d,class,chapter\". По умолчанию: %default"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Ошибка получения метаданных"
+
+#~ msgid "Send to storage card by default"
+#~ msgstr "По умолчанию отправлять в карту памяти"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "&Количество обложек показываемых в режиме просмотра (после перезагрузки):"
@@ -6392,9 +6934,6 @@ msgstr "Показать детальную информацию. Использ
 #~ "Если вы заблокировали эту строку, метаданные определятся из названия файла. "
 #~ "Это может быть настроено в Расширенной секции."
 
-#~ msgid "Use internal &viewer for the following formats:"
-#~ msgstr "Использовать встроенный просматровщик для следующих форматов:"
-
 #~ msgid "Last downloaded: %s days ago"
 #~ msgstr "Последний раз скачано: %s дней тому назад"
 
diff --git a/src/calibre/translations/sk.po b/src/calibre/translations/sk.po
index 2e65d7ac41..2ad96c6fec 100644
--- a/src/calibre/translations/sk.po
+++ b/src/calibre/translations/sk.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-03-05 12:30+0000\n"
 "Last-Translator: Stano Sitar <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Nerobí vôbec nič"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Nerobí vôbec nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Nerobí vôbec nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -137,27 +144,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Číta metadáta zo súborov %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Preberá obálky zo súborov s komiksami"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Číta metadáta z elektronických kníh v archívoch ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Číta metadáta z elektronických kníh v archívoch RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr "Zapisuje metadáta do súborov %s"
 
@@ -226,17 +234,17 @@ msgstr "Deaktivovať modul podľa mena"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "V čítacom zariadení nie je vložená žiadna pamäťová karta."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr "Na pamäťovej karte nie je dostatok voľného miesta"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr "V hlavnej pamäti zariadenia nie je dostatok miesta"
 
@@ -546,7 +554,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr "V archíve nebola nájdená žiadna elektronická kniha"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -563,14 +571,14 @@ msgstr ""
 "Ak miesto HTML súboru zadáte OPF súbor, odkazy budú prevzaté z jeho sekcie "
 "<spine>.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr "Výstup zapísaný do "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Musíte zadať vstupný HTML súbor"
 
@@ -592,26 +600,26 @@ msgstr ""
 "\t\tPríliš zložitá štruktúra súboru. Prerozdeľujem bez zachovania štruktúry. "
 "Súbor sa môže zobraziť nekorektne."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Spracované HTML bolo zapísané do "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Možnosti spracovania HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Výstupný adresár. Štandardne sa použije aktuálny pracovný adresár."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Kódovanie znakov v HTML súboru. Bez explicitne zadanej hodnoty bude "
 "detekované automaticky."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -619,11 +627,11 @@ msgstr ""
 "Vytvoriť výstup v súbore .zip. Ak je zvolená táto možnosť, --output by mal "
 "byť názov súboru, nie adresára."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Nasledovanie odkazov v HTML súboroch."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -631,7 +639,7 @@ msgstr ""
 "Prechádzať odkazy v HTML súboroch \"najprv do šírky\". Štandardne sa odkazy "
 "prechádzajú \"najprv do hĺbky\"."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -640,39 +648,39 @@ msgstr ""
 "je pozitívna hodnota. 0 značí, že žiadne odkazy v koreňovom súbore nebudú "
 "prechádzané."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Metadáta vygenerovanej elektronickej knihy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Názov. Štandardne automaticky detekovaný."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr "Autor(i) knihy, oddelení ampersandmi (&)."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Témy tejto knihy, oddelené čiarkami."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr "Vydavateľ knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr "Stručný obsah knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr "Súbor OPF z ktorého sa majú prevziať metadáta."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Možnosti užitočné pri hľadaní chýb v programe."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -680,11 +688,11 @@ msgstr ""
 "Pri spracovaní vypisovať viac informácií. Viacnásobné použitie ďalej zvyšuje "
 "množstvo zobrazených informácií."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr "Výstupný HTML súbor bude úhľadne formátovaný pre uľahčenie čítania."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -711,7 +719,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [možnosti] LITsúbor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Výstupný adresár. Štandardne aktuálny pracovný adresár."
 
@@ -727,7 +735,7 @@ msgid "Useful for debugging."
 msgstr "Užitočné pri hľadaní chýb v programe."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB elektronická kniha bude vytvorená v"
 
@@ -770,9 +778,9 @@ msgid "Sort key for the author"
 msgstr "Autor, v tvare vhodnom pre triedenie (priezvisko, meno)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Vydavateľ"
 
@@ -1675,63 +1683,63 @@ msgstr "Mená autorov"
 msgid "Set the comment"
 msgstr "Poznámky"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Názov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr "Producent"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Poznámky"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Tagy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Séria"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr "Jazyk"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Časová známka"
 
@@ -1864,7 +1872,7 @@ msgstr "Jazyk knihy"
 msgid "Set the ISBN"
 msgstr "ISBN kód knihy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr "Hodnota položky dc:language"
 
@@ -1880,11 +1888,11 @@ msgstr "Použitie: rb-meta súbor.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr "Vytváranie Mobipocket súboru z EPUB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog  [možnosti]  kniha.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "Neupravené MOBI HTML uložené do"
 
@@ -2072,99 +2080,103 @@ msgstr ""
 "\tOreže PDF. \n"
 "\t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Často používané adresáre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 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:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 "Formát, ktorý má byť použitý pri ukladaní jednotlivých súborov na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Vyžadovať potvrdenie pred zmazaním"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Veľkosť ikon panelu nástrojov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Zobrazovať nadpisy tlačidiel panelu nástrojov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Usporiadanie hlavného okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 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:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 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:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr "Triediť zoznam tagov podľa popularity"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 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:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Štandardné nastavenie prevodu do formátu LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 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:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 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:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 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:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 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:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr "Najstaršie správy ponechané v databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr "Zobraziť ikonu v systémovej lište"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr "Odoslať prevzaté správy do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 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:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 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:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 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:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr "Kniha %s bola pridaná do knižnice"
@@ -2203,7 +2215,7 @@ msgid "Adding books to database..."
 msgstr "Pridávam knihy do databázy..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr "Čítam metadáta..."
 
@@ -2211,43 +2223,187 @@ msgstr "Čítam metadáta..."
 msgid "Searching in"
 msgstr "Hľadám v"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Zariadenie už nie je pripojené."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Získať informácie o zariadení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Prevziať zoznam kníh v zariadení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Odoslať metadáta do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Odoslať %d kníh do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Zmazať knihy zo zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Prevziať knihy zo zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Zobraziť knihu v zariadení"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "a zmazať z knižnice"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Uložiť do hlavnej pamäte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Uložiť na pamäťovú kartu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr "Vyberte formát na poslanie do zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr "od"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Žiadne vhodné formáty"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr "Odosielam správy do zariadenia."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Odosielam knihy do zariadenia."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Nasledovné knihy nebolo možné odoslať do zariadenia, lebo nie sú dostupné vo "
+"vhodnom formáte:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Prekročená kapacita zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Knihy nie je možné odoslať do zariadenia pre nedostatok voľného úložného "
+"priestoru "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Cesta"
@@ -2256,7 +2412,8 @@ msgstr "Cesta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2354,27 +2511,29 @@ msgstr "Širo&ké obrázky"
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr " moduly"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
-msgstr "od"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Rozšírené"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr "Všeobecné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr "Rozhranie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Rozšírené"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
@@ -2382,104 +2541,151 @@ msgstr ""
 "Obsahový\n"
 "Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr "Moduly"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr "Chýba platná cesta k modulom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr "%s nie je platná cesta k modulom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr "Zvoľte modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr "Modul nie je možné deaktivovať"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr "Modul %s nie je možné deaktivovať"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr "Modul nie je upraviteľný"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr "Modul %s neumožňuje žiadne úpravy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr "Upraviť %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr "Vstavaný modul nie je možné odstrániť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " nemôže byť odstránený. Je to vstavaý modul. Skúste ho miesto odstránenia "
 "deaktivovať."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr "Záznam o chybách:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr "Záznam o prístupe:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr "Nepodarilo sa spustiť obsahový server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr "Neplatná veľkosť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Veľkosť %s je neplatná. Požadovaný formát je šírka x výška"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Neplatné umiestnenie databázy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Musí byť adresár."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Neplatné umiestnenie databázy "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Musí byť adresár."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Neplatné umiestnenie databázy.<br>Nemôžem zapisovať do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Zmenšujem databázu. Tento proces môže chvíľu trvať."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Zmenšujem..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Zmenšujem databázu. Tento proces môže chvíľu trvať."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Nastavenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2487,16 +2693,16 @@ msgstr ""
 "&Umiestnenie elektronických kníh (Knihy sú umiestnené v adresároch podľa "
 "autora a metadáta sú uložené v súbore metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Určte nové umiestnenie databázy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2514,18 +2720,18 @@ msgstr "Určte nové umiestnenie databázy"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Zobraziť upozornenie keď je k dispozícii &nová verzia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
@@ -2533,19 +2739,19 @@ msgstr ""
 "Ak vypnete túto možnosť, metadáta budú odvodené z názvu súboru. Podrobnosti "
 "je možné určiť v sekcii rozšírených nastavení."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr "Čítať &metadáta zo súborov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Formát pre uloženie do jedného &súboru:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "Štandardný časový &limit siete:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -2553,112 +2759,225 @@ msgstr ""
 "Štandardný časový limit pre sieťové dopyty (pri preberaní informácií z "
 "internetu)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " sekúnd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr "Vyberte &jazyk (vyžaduje reštart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr "Normálna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr "Vysoká"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr "Nízka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr "&Priorita úloh:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Pridať adresár do zoznamu často používaných"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Odobrať adresár zo zoznamu často používaných"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Číslovať knihy v sérii &Rímskymi číslicami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Zobraziť &ikonu v systémovej lište"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr "Zobrazovať &upozornenia v systémovej lište"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 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/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "&Automaticky odosielať prevzaté správy do čítacieho zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr "&Zmazať správy z knižnice po ich odoslaní do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 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/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Panel nástrojov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Veľké"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Stredné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Malé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "&Veľkosť tlačidiel na paneli nástrojov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Zobraziť &text na tlačidlách panelu nástrojov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Viditeľné &stĺpce v zozname kníh v knižnici"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr "Použiť interný &prehliadač pre:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "Po&užívateľské meno:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Heslo:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Uvoľniť nepoužitý diskový priestor v databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "Zmenšiť &databázu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Metadáta zo súboru"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2668,23 +2987,11 @@ msgstr ""
 "pomocou internetového prehliadača, z akéhokoľvek miesta na svete. Zmeny v "
 "nastaveniach sa prejavia až po reštarte servera."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr "&Port servera:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "Po&užívateľské meno:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Heslo:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2692,13 +2999,13 @@ msgstr ""
 "Ak ponecháte heslo prázdne, ktokoľvek bude mať prístup k vašej zbierke kníh "
 "cez toto webové rozhranie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Zobraziť heslo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -2706,31 +3013,31 @@ msgstr ""
 "Maximálna veľkosť (šírka x výška) zobrazených obálok. Veľké obálky budú "
 "zmenšené. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr "Max. veľkosť &obálok:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr "&Spustiť server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr "&Zastaviť server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr "&Test servera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr "&Automaticky spustiť server pri štarte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr "Z&obraziť serverové záznamy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2744,34 +3051,34 @@ msgstr ""
 "Stanza na vašom iPhone, pričom \"mojehostname\" musí byť úplná symbolická "
 "alebo IP adresa vášho počítača."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 "Tu môžte upraviť správanie calibre, určením aké moduly bude používať."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr "Aktivovať/&Deaktivovať modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr "&Upraviť modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr "&Odstrániť modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr "Pridať nový modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr "&Súbor modulu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr "&Pridať"
 
@@ -2799,7 +3106,7 @@ msgstr "Previesť %s do formátu "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadáta"
@@ -2858,26 +3165,26 @@ msgstr "Vyberte obálku pre "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Nemôžem čítať"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Nemáte prístupové práva na čítanie súboru: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Chyba pri čítaní súboru"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Chyba pri čítaní súboru: <br /><b>"
 
@@ -2887,7 +3194,7 @@ msgid " is not a valid picture"
 msgstr " nie je platný obrazový súbor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Nemôžem previesť"
 
@@ -3225,52 +3532,56 @@ msgstr "Názov vygenerovaného &obsahu"
 msgid "Level &3 TOC"
 msgstr "Obsah úrovne &3"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Autor (triediť ako)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Spojenie zlyhalo"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Musíte zadať platný kľúč pre isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Chyba preberania metadát"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Žiadne metadáta neboli nájdené"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Žiadne metadáta neboli nájdené, skúste pozmeniť titul a autora, alebo ISBN "
 "kód."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Prevziať metadáta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Preberám metadáta pre <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Založte si bezplatný účet na <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> a získate prístupový kľúč."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3611,33 +3922,33 @@ msgstr "Odstrániť &formát:"
 msgid "A&utomatically set author sort"
 msgstr "A&utomaticky odvodiť autora v tvare pre triedenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr "Nie je zvolený žiaden formát"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr "Nepodarilo sa načítať metadáta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr "Nepodarilo sa načítať metadáta z formátu %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr "Nepodarilo sa načítať obálku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr "Nepodarilo sa načítať obálku z formátu %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr "Obálka vo formáte %s je neplatná"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3647,26 +3958,44 @@ msgstr ""
 "<br/>Ak ich zatiaľ nemáte, bezplatne sa <a "
 "href='http://www.librarything.com'>zaregistrujte</a>.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Nepodarilo sa prevziať obálku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Musíte zadať kód ISBN tejto knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Nepodarilo sa prevziať obálku.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Musíte zadať kód ISBN tejto knihy"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3747,84 +4076,85 @@ msgstr "Vlastné"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr "Naplánované"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr "Hľadať"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr "%d receptov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr "Pondelok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr "Streda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr "deň"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr "Piatok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr "Sobota"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr "Operácia vyžaduje prihlasovacie údaje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr "Tento recept vyžaduje prihlasovacie meno a heslo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr "Autor: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr "pred %d dňami, %d hodinami a %d minútami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr "Posledne prevzatý"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr "Posledne prevzatý: nikdy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr "Naplánovať preberanie správ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Pridať vlastný zdroj správ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4269,11 +4599,11 @@ msgstr "Regulárny výraz (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Žiadna zhoda"
 
@@ -4358,35 +4688,35 @@ msgstr "Nie je možné zastaviť úlohy, ktoré komunikujú so zariadením"
 msgid "Job has already run"
 msgstr "Úloha je už dokončená"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Veľkosť (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Dátum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Hodnotenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Žiadne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 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.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr "Nedovolené"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -4394,11 +4724,15 @@ msgstr ""
 "Priamy prenos kníh do zariadenia nie je možný. Najprv pridajte knihy do "
 "databázy calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Formát"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Hľadať (pre rozšírené vyhľadávanie kliknite na tlačidlo vľavo)"
 
@@ -4427,7 +4761,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:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Neboli nájdené žiadne výsledky"
 
@@ -4474,23 +4808,23 @@ msgstr "Otvoriť elektronickú knihu"
 msgid "Configure"
 msgstr "Nastavenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Chyba komunikácie so zariadením"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr "&Obnoviť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr "&Prispejte na vývoj calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr "&Reštartovať"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4498,43 +4832,24 @@ msgstr ""
 "<p>Pre ďalšie informácie navštívte <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 "<b>%s</b>: %s od <b>Kovida Goyala %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Uložiť do hlavnej pamäte"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Uložiť na pamäťovú kartu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "a zmazať z knižnice"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Ukladať prednostne na pamäťovú kartu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Upraviť metadáta individuálne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Upraviť metadáta dávkovo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Pridať knihy z jedného adresára"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -4543,7 +4858,7 @@ msgstr ""
 "adresár predstavuje jednu knihu a súbory v ňom sú rôzne formáty tej istej "
 "knihy)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -4551,79 +4866,79 @@ msgstr ""
 "Pridať knihy z adresárov, vrátane podadresárov (viacero kníh na adresár, "
 "t.j. predpokladá sa, že každý súbor je iná kniha)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Uložiť na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Uložiť na disk v jednom adresári"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Uložiť len formát %s na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Prezrieť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Prezrieť určitý formát"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Previesť individuálne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Previesť dávkovo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr "Štandardné nastavenie prevodu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Štandardné nastavenie prevodu komiksov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr "Podobné knihy..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr "Neplatné umiestnenie databázy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Zvoľte umiestnenie pre vašu elektronickú knižnicu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr "Prehliadať obálky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Zariadenie: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " nájdené."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Pripojené "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Databáza zariadenia je poškodená"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4651,67 +4966,56 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Odosielam knihy do zariadenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr "Knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr "EPUB knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr "LRF knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr "HTML knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr "LIT knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr "MOBI knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr "TXT knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr "PDF knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr "Komiksy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr "Archívy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr "Pridávam knihy..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Prekročená kapacita zariadenia"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>Knihy nie je možné odoslať do zariadenia pre nedostatok voľného úložného "
-"priestoru "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -4719,63 +5023,39 @@ msgstr ""
 "Označené knihy budú <b>permanentne zmazané</b> a súbory budú odstránené z "
 "vášho počítača. Určite ich chcete odstrániť?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Mažem knihy zo zariadenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Nemožno upraviť metadáta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Nie sú označené žiadne knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr "Odosielam správy do zariadenia."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr "Vyberte formát na poslanie do zariadenia"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Odosielam knihy do zariadenia."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Žiadne vhodné formáty"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"Nasledovné knihy nebolo možné odoslať do zariadenia, lebo nie sú dostupné vo "
-"vhodnom formáte:<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Chyba zápisu na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr "Ukladám na disk..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr "Uložené"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr "Zvoľte cieľový adresár"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4783,65 +5063,65 @@ msgstr ""
 "<p>Nasledovné knihy nebolo možné uložiť na disk, lebo nie sú dostupné vo "
 "formáte %s:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Niektoré elektronické knihy sa nepodarilo uložiť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Preberám správy z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr " prevzaté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Nie je označená žiadna kniha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Nemôžem zobraziť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Vyberte formát, ktorý sa má zobraziť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr "Nemožno otvoriť adresár"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s nie je dostupná v žiadnom známom formáte."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Nemožno nastaviť"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 "Nastavenia nie je možné zmeniť, kým neprebehne spracovanie všetkých úloh."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr "Kopírujem databázu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopírujem databázu do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Neplatná alebo poškodená databáza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4849,23 +5129,23 @@ msgstr ""
 "<p>V adresári %s sa už nachádza poškodená alebo neplatná databáza. Odstráňte "
 "ju predtým než tam presuniete súčasnú databázu.<br>Chyba: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Nepodarilo sa presunúť databázu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Bližšie informácie nie sú dostupné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr "Bližšie informácie o knihách v tomto zariadení nie sú dostupné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Chyba komunikácie so zariadením"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4873,13 +5153,13 @@ 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/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Chyba prevodu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4887,15 +5167,15 @@ msgstr ""
 "<p>Nepodarilo sa previesť: %s<p>Obsahuje <a href=\"%s\">ochranu proti "
 "kopírovaniu</a>. Ochranu musíte najprv nejakým externým nástrojom odstrániť."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4903,11 +5183,11 @@ msgstr ""
 "je výsledkom snahy mnohých dobrovoľníkov z celého sveta. Ak je pre vás "
 "užitočný, prosím zvážte možnosť príspevku na jeho vývoj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 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/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
@@ -4918,11 +5198,11 @@ msgstr ""
 "zariadení.<br>\n"
 "                      'Určite chcete program ukončiť?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr "UPOZORNENIE: Prebieha spracovanie úloh"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -4930,7 +5210,7 @@ msgstr ""
 "bude ďalej bežať v systémovej lište. Ak si želáte ho ukončiť, z kontextového "
 "menu ikony v systémovej lište zvoľte položku <b>Ukončiť</b>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4938,7 +5218,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Najnovšia verzia: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Bola vydaná nová verzia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4948,49 +5232,45 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">tu</a>. Želáte si "
 "navštíviť stránku so súbormi na preberanie?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Bola vydaná nová verzia"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr "Použiť knižnicu, ktorá sa nachádza na uvedenej ceste."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr "Spustiť program v systémovej lište."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr "Do konzoly vypísať informácie užitočné pri hľadaní chýb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr "Výstup:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr "Zvoľte formát, ktorý bude použitý pri prevode kníh a preberaní správ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Rozšírené hľadanie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "&Hľadať:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4998,7 +5278,7 @@ msgstr ""
 "Hľadanie v zozname kníh podľa názvu alebo autora<br><br>Hľadať sa bude "
 "reťazec obsahujúci všetky zadané slová"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -5006,113 +5286,109 @@ msgstr ""
 "Hľadanie v zozname kníh podľa názvu, autora, vydavateľa a "
 "poznámok<br><br>Hľadať sa bude reťazec obsahujúci všetky zadané slová"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Zrušiť rýchle hľadanie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr "Nájsť ktorékoľvek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr "Nájsť všetky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr "Utriediť podľa &popularity"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Pridať knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Odstrániť knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Upraviť metadáta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Odoslať do zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Prevziať správy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Previesť knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr "Otvoriť nadradený adresár"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr "Zobraziť podrobnosti o knihe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr "Knihy od rovnakého autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr "Knihy v tejto sérii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr "Knihy od tohto vydavateľa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr "Knihy s rovnakými tagmi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr "Pošlite konkrétny formát do zariadenia"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Nastavenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5304,85 +5580,85 @@ msgstr "Veľkosť neproporcionálneho písma v obrazových bodoch"
 msgid "The standard font type"
 msgstr "Štandardný typ písma"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr "Prejsť na..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr "Pozícia v knihe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr "/Neznámy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr "Prejsť na referenciu. Čísla referencií získate v režime referencií."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr "Hľadať text v knihe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr "Vyberte elektronickú knihu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr "Elektronické knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr "Pridať záložku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr "Zadajte názov záložky:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 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:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr "Načítavam prúd..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr "Formátujem %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr "Načítavam elektronickú knihu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 "<p>Táto kniha je chránená <a href=\"%s\">ochranou proti kopírovaniu</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr "Chyba ochrany proti kopírovaniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr "Nepodarilo sa otvoriť knihu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 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:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5436,15 +5712,15 @@ msgstr "Záložka"
 msgid "Toggle full screen"
 msgstr "Prepnúť zobrazenie na celú obrazovku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Neplatný regulárny výraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Neplatný regulárny výraz: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
@@ -5454,7 +5730,7 @@ msgstr ""
 "%d\n"
 "kníh"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
@@ -5464,7 +5740,7 @@ msgstr ""
 "%s\n"
 "voľného miesta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
@@ -5474,17 +5750,17 @@ msgstr ""
 "%s\n"
 "voľného miesta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Kliknutím sem zobrazíte zoznam kníh na vašom počítači"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Kliknutím sem zobrazíte zoznam kníh v hlavnej pamäti vášho čítacieho "
 "zariadenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Kliknutím sem zobrazíte zoznam kníh na pamäťovej karte vášho čítacieho "
@@ -5929,6 +6205,10 @@ msgstr "Nepodarilo sa naviazať SSH spojenie: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Zlyhala autentifikácia na serveri: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -6213,34 +6493,41 @@ msgstr "Zlyhalo preberanie článku: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Preberám prúd"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
-msgstr "Španielčina"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
+msgstr "Chorvátština"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr "Srbština"
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -6288,7 +6575,7 @@ msgstr "Španielčina"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6340,27 +6627,35 @@ msgstr "Španielčina"
 msgid "English"
 msgstr "Angličtina"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
-msgstr "Srbština"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
+msgstr "Španielčina"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_cyberpresse.py:9
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr "Francúzština"
 
@@ -6369,6 +6664,10 @@ msgstr "Francúzština"
 msgid "Dutch"
 msgstr "Holandština"
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6379,7 +6678,7 @@ msgstr "Portugalčina"
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6390,10 +6689,6 @@ msgstr "Nemčina"
 msgid "Kovid Goyal"
 msgstr "Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr "Chorvátština"
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr "Taliančina"
@@ -6445,6 +6740,22 @@ msgstr ""
 #~ msgid "Don't know what this is for"
 #~ msgstr "Účel tejto položky nie je známy"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Spojenie zlyhalo"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Musíte zadať platný kľúč pre isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Preberám metadáta pre <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Založte si bezplatný účet na <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> a získate prístupový kľúč."
+
 #~ msgid "Could not fetch cover"
 #~ msgstr "Nepodarilo sa prevziať obálku"
 
@@ -6457,6 +6768,12 @@ msgstr ""
 #~ msgid "Change password"
 #~ msgstr "Zmeniť heslo"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Chyba preberania metadát"
+
+#~ msgid "Send to storage card by default"
+#~ msgstr "Ukladať prednostne na pamäťovú kartu"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "Počet &obálok zobrazených v režime prehliadania obálok (vyžaduje reštart):"
diff --git a/src/calibre/translations/sl.po b/src/calibre/translations/sl.po
index d6fd691818..418314971f 100644
--- a/src/calibre/translations/sl.po
+++ b/src/calibre/translations/sl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.17\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-01-19 08:55+0000\n"
 "Last-Translator: Janko Slatenšek <Unknown>\n"
 "Language-Team: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Ne naredi popolnoma nič"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Ne naredi popolnoma nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Ne naredi popolnoma nič"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -134,27 +141,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Preberi meta podatke iz %s datotek"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Pridobi naslovno stran iz stripa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -218,17 +226,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Reader nima vstavljene spominske kartice."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -473,7 +481,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -484,14 +492,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr "Izbrati morate vhodno HTML datoteko"
 
@@ -510,25 +518,25 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr "Obdelane HTML datoteke so zapisane v "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr "Možnosti za nadzor sprehajanja po HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr "Izhodni direktorij. Privzeti je trenutni direktorij."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Kodna tabela znakov za HTML datoteke. Privzeto je samodejno zaznavanje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 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."
@@ -536,11 +544,11 @@ msgstr ""
 "Ustvari izhodne podatke v zip datoteki. Če je izbrana ta možnost mora biti --"
 "output ime datoteke, ne direktorija."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr "Nadzira sledeče povezave v HTML datotekah."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -548,7 +556,7 @@ msgstr ""
 "Po povezavah v HTML datoteki se sprehodi najprej po širini. Običajno se "
 "najprej sprehodi po globini"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -557,49 +565,49 @@ msgstr ""
 "biti pozitivna vrednost. 0 pomeni da se ne sledi nobeni povezavi v osnovni "
 "HTML datoteki."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr "Nastavi meta podatke od generirane eknjige"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr "Nastavi naslov. Privzeto je samodejno zaznavanje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr "Možnosti koristne za razhroščevanje"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr "Izhodni HTML je \"lepo oblikovan\" za lažje analiziranje"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -620,7 +628,7 @@ msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr "Izhodni direktorij. Privzet je trenutni direktorij."
 
@@ -635,7 +643,7 @@ msgid "Useful for debugging."
 msgstr "Koristno za razhroščevanje."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr "OEB eknjiga ustvarjena v"
 
@@ -677,9 +685,9 @@ msgid "Sort key for the author"
 msgstr "Sortirni ključ za avtorja"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "Založnik"
 
@@ -1536,63 +1544,63 @@ msgstr "Nastavi avtorje"
 msgid "Set the comment"
 msgstr "Nastavi opombe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "Naslov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "Avtor(ji)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Opombe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr "Značke"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr "Serija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr "Časovna znamka"
 
@@ -1724,7 +1732,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1740,11 +1748,11 @@ msgstr "Uporaba: rb-meta datoteka.rb"
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] mojaeknjiga.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr "Neobdelan MOBI HTML shranjen v"
 
@@ -1911,97 +1919,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr "Pogosto rabljeni direktoriji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr "Format, ki se uporablja pri shranjevanju posameznih datotek na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr "Potrdite pred brisanjem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr "Velikost ikon v orodni vrstici"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr "Prikaži tekstovne oznake v orodni vrstici"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr "Geometrija glavnega okna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr "Opozori me kadar je na voljo nova verzija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr "Uporabi rimska števila za številke serij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr "Število naslovnic, ki se pokažejo v cover browsing mode"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr "Privzete nastavitve za pretvorbo v LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr "Možnosti za pregledovalnik LRF eknjig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -2039,7 +2051,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -2047,43 +2059,186 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr "Naprava ni več priklopljena."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr "Pridobi podatke o napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr "Pridobi seznam knjig iz naprave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr "Pošlji meta podatke v napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr "Prenesi %d knjig v napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr "Izbriši knjige iz naprave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr "Prenesi knjige iz naprave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr "Poglej knjigo na napravi"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr "in izbriši iz knjižnice"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr "Pošlji v glavni pomnilnik"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr "Pošlji v spominsko kartico"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr "Ni ustreznih formatov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr "Pošlji knjige v napravo."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+"Prenos sledečih knjig ni uspel, ker ni bil najden potreben "
+"format:<br><ul>%s</ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr "Na napravi ni več prostora"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+"<p>Prenos knjig na napravo ni mogoč, ker na napravi ni dovolj prostora "
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pot"
@@ -2092,7 +2247,8 @@ msgstr "Pot"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2190,128 +2346,177 @@ msgstr "&Široko"
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "Napredno"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "Napredno"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr "Napačna lokacija podatkovne baze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr "<br>Mora biti direktorij."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr "Napačna lokacija podatkovne baze "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr "<br>Mora biti direktorij."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Napačna lokacija podatkovne baze. <br>Ne morem pisati v "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr "Krčenje podatkovne baze. To lahko traja nekaj časa."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr "Krčenje ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr "Krčenje podatkovne baze. To lahko traja nekaj časa."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "Konfiguracija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -2319,16 +2524,16 @@ msgstr ""
 "&Lokacija eknjig (eKnjige so shranjene v datoteke sortirane po avtorjih, "
 "meta podatki pa v datoteki metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr "Prebrskaj za novo lokacijo podatkovne baze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2346,211 +2551,312 @@ msgstr "Prebrskaj za novo lokacijo podatkovne baze"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr "Opozori me, ko je na voljo &nova verzija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr "Format za &shranjevanje enojne datoteke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr "Privzeti omrežni &timeout:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr "Dodaj direktorij k seznamu pogosto rabljenih direktorijev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Odstrani direktorij iz seznama pogosto rabljenih direktorijev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr "Uporabi &rimska števila za številke serij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "Orodna vrstica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr "Veliko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr "Srednje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "Majhno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr "Velikost gum&ba orodne vrstice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr "Prikaži &tekst pri gumbih v orodni vrstici"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr "Izberi vidne stolp&ce v knjižničnem pogledu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr "&Uporabniško ime:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&Geslo:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr "Sprosti neuporabljen prostor iz baze podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr "&Skrči podatkovno bazo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr "&Meta podatki iz imena datoteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr "&Uporabniško ime:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&Geslo:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr "&Prikaži geslo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2559,33 +2865,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2613,7 +2919,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Meta podatki"
@@ -2667,26 +2973,26 @@ msgstr "Izberi naslovnico za "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr "Ne morem prebrati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr "Nimate pravic za branje datoteke: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr "Napaka pri branju zbirke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Prišlo je do napake pri branju iz zbirke: <br /><b>"
 
@@ -2696,7 +3002,7 @@ msgid " is not a valid picture"
 msgstr " ni veljavna slika"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr "Pretvorba ni možna"
 
@@ -3020,51 +3326,55 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr "Razvrščanje Avtorjev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
-msgstr "Ne morem se povezati"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
-msgstr "Vpisati morate veljaven ključ za isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
-msgstr "Napaka pri prinašanju meta podatkov"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr "Ne najdem meta podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 "Ne najdem meta podatkov, poskusite spremeniti naslov, avtorja ali ISBN ključ."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetch metadata"
 msgstr "Prenesi meta podatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
-msgstr "Prenašam meta podatke za <b>%1</b>"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
-"Prijavite se za brezplačen račun na <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> in si pridobite dostopni ključ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
@@ -3393,33 +3703,33 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -3429,26 +3739,44 @@ msgstr ""
 "gesla še nimate se lahko <a "
 "href='http://www.librarything.com'>registrirate</a> zastonj!</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr "Prenos naslovnice ni možen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr "Določiti morate ISBN oznako te knjige."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Prenos naslovnice ni uspel.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
-msgstr "Določiti morate ISBN oznako te knjige."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
 msgid "Edit Meta Information"
@@ -3528,84 +3856,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr "Dodaj vir novic po meri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -4012,11 +4341,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr "Brez zadetka"
 
@@ -4101,45 +4430,49 @@ msgstr "Ne morem prekiniti poslov, ki komunicirajo z napravo"
 msgid "Job has already run"
 msgstr "Posel je že bil pognan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr "Nič"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Knjiga <font face=\"serif\">%s</font> od %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Dvoklikni me da me <b>urediš</b><br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Najdi (Za Napredno Iskanje pritisnite gumb na levi)"
 
@@ -4168,7 +4501,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Ni zadetkov</b> za iskalni niz <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr "Nič zadetkov najdenih"
 
@@ -4215,23 +4548,23 @@ msgstr "Odpri eknjigo"
 msgid "Configure"
 msgstr "Nastavi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr "Napaka pri komuniciranju z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -4239,126 +4572,107 @@ msgstr ""
 "<p>Za pomoč obiščite <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr "Pošlji v glavni pomnilnik"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr "Pošlji v spominsko kartico"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr "in izbriši iz knjižnice"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr "Privzeto pošlji v spominsko kartico"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr "Posamično urejanje meta podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr "Paketno urejanje meta podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr "Dodaj knjige iz enega direktorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr "Shrani na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr "Shrani na disk v en direktorij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr "Shrani samo %s format na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr "Poglej"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr "Poglej specifičen format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr "Posamična pretvorba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr "Paketna pretvorba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr "Nastavi privzete možnosti za pretvorbo stripov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr "Izberite lokacijo za vašo eKnjižnico."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr "Naprava: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr " zaznan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr "Povezan "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr "Podatkovna baza poškodovana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4388,128 +4702,94 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr "Prenašanje knjig na napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr "Na napravi ni več prostora"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-"<p>Prenos knjig na napravo ni mogoč, ker na napravi ni dovolj prostora "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr "Izbriši knjige iz naprave."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr "Spreminjanje meta podatkov ni mogoče"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr "Nobena od knjig ni izbrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr "Pošlji knjige v napravo."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr "Ni ustreznih formatov"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-"Prenos sledečih knjig ni uspel, ker ni bil najden potreben "
-"format:<br><ul>%s</ul>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr "Ne morem shraniti na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -4517,64 +4797,64 @@ msgstr ""
 "<p>Prenos sledečih knjig na disk ni uspek, ker %s format ni na voljo "
 "zanje:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr "Nekaterih knjig ni bilo mogoče shraniti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr "Prenašam novice iz "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr "Nobena od knjig ni izbrana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr "Pogled ni možen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr "Izberite format, ki ga želite videti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr "%s nima razpoložljivih formatov."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr "Nemogoča konfiguracija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr "Spreminjanje konfiguracije med poganjanjem poslov ni mogoče."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopiram knjižnico v "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr "Neustrezna podatkovna baza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4582,23 +4862,23 @@ msgstr ""
 "<p>Neveljavna podatkovna baza že obstaja v %s, izbrišite jo preden poskusite "
 "premakniti obstoječo podatkovno bazo.<br>Napaka: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr "Premik podatkovne baze ni bil mogoč"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr "Podrobne informacije niso na voljo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr "Podrobne informacije za knjige na napravi niso na voljo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr "Napaka pri pogovoru z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4606,54 +4886,54 @@ msgstr ""
 "Prišlo je do napake pri komuniciranju z napravo. Prosim ponovno zaženite ali "
 "izklopite in ponovno vklopite napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr "Pretvorna Napaka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4661,7 +4941,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Zadnja verzija: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr "Navoljo je posodobitev"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4671,49 +4955,45 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">seznam "
 "posodobitev</a>. Prikažem domačo stran?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr "Navoljo je posodobitev"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr "Napredno iskanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr "I&skanje:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4721,7 +5001,7 @@ msgstr ""
 "Iskanje knjig po naslovu ali avtorju<br><br>Besede ločene s presledkom se "
 "obravnavajo po pravilu IN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4729,113 +5009,109 @@ msgstr ""
 "Iskanje knjig po naslovu, avtorju, založniku, značkah ali "
 "opombah<br><br>Besede ločene s presledkom se obravnavajo po pravilu IN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr "Resetiraj Hitro Iskanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr "Dodaj knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr "Odstrani knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr "Uredi meta podatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr "Pošlji napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr "Prenesi novice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr "Pretvori eKnjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -5027,84 +5303,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -5155,46 +5431,46 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr "Neveljaven regularni izraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr "Neveljaven regularni izraz: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr "Kliknite za seznam knjig, ki so na voljo na vašem računalniku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Kliknite za seznam knjig, ki so na voljo v glavnem pomnilniku vašega reader-"
 "ja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Kliknite za seznam knjig, ki so na voljo v spominski kartici v vašem reader-"
@@ -5613,6 +5889,10 @@ msgstr "Avtentikacija SSH seje ni uspela: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Avtentikacija s strežnikom ni uspela: %s"
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5875,34 +6155,41 @@ msgstr "Prenos članka ni uspel: %s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr "Prenašam feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5950,7 +6237,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -6002,20 +6289,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -6023,6 +6317,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -6031,6 +6326,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -6041,7 +6340,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -6052,10 +6351,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
@@ -6110,6 +6405,22 @@ msgstr "Podrobneje prikaži izhodne informacije. Koristno za razhroščevanje."
 #~ msgid "&Priority for conversion jobs:"
 #~ msgstr "&Prioriteta za pretvorne posle:"
 
+#~ msgid "Cannot connect"
+#~ msgstr "Ne morem se povezati"
+
+#~ msgid "You must specify a valid access key for isbndb.com"
+#~ msgstr "Vpisati morate veljaven ključ za isbndb.com"
+
+#~ msgid "Fetching metadata for <b>%1</b>"
+#~ msgstr "Prenašam meta podatke za <b>%1</b>"
+
+#~ msgid ""
+#~ "Sign up for a free account from <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+#~ msgstr ""
+#~ "Prijavite se za brezplačen račun na <a "
+#~ "href=\"http://www.isbndb.com\">ISBNdb.com</a> in si pridobite dostopni ključ."
+
 #~ msgid "Options"
 #~ msgstr "Možnosti"
 
@@ -6159,9 +6470,6 @@ msgstr "Podrobneje prikaži izhodne informacije. Koristno za razhroščevanje."
 #~ "voljo.<p>Uporabite <b>Test</b> funkcionalnost spodaj za testiranje lastnih "
 #~ "regularnih izrazov na nekaj vzorčnih imenih datotek."
 
-#~ msgid "Double click to <b>edit</b> me<br><br>"
-#~ msgstr "Dvoklikni me da me <b>urediš</b><br><br>"
-
 #~ msgid ""
 #~ "Add books recursively (One book per directory, assumes every ebook file is "
 #~ "the same book in a different format)"
@@ -6230,6 +6538,12 @@ msgstr "Podrobneje prikaži izhodne informacije. Koristno za razhroščevanje."
 #~ "Polja, ki so na voljo: %s\n"
 #~ "Privzeto: %%default"
 
+#~ msgid "Error fetching metadata"
+#~ msgstr "Napaka pri prinašanju meta podatkov"
+
+#~ msgid "Send to storage card by default"
+#~ msgstr "Privzeto pošlji v spominsko kartico"
+
 #~ msgid "&Number of covers to show in browse mode (after restart):"
 #~ msgstr ""
 #~ "Število &naslovnic, ki se prikažejo v preletavanju naslovnic (po ponovnem "
diff --git a/src/calibre/translations/sv.po b/src/calibre/translations/sv.po
index 466cddbeaa..e8966b2031 100644
--- a/src/calibre/translations/sv.po
+++ b/src/calibre/translations/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2009-03-15 09:28+0000\n"
 "Last-Translator: nicke <niklas.aronsson@gmail.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: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr "Gör ingenting"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -134,27 +141,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr "Läs metadata från %s filer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr "Extrahera omslag från serietidningsfiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Läs metadata från eböcker i ZIP-arkiv"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Läs metadata från eböcker i RAR-arkiv"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -218,17 +226,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr "Läsaren har inga minneskort inkopplade."
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -481,14 +489,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -507,88 +515,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -609,7 +617,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -624,7 +632,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -665,9 +673,9 @@ msgid "Sort key for the author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr ""
 
@@ -1393,63 +1401,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1565,7 +1573,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1581,11 +1589,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1752,97 +1760,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1879,7 +1891,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1887,43 +1899,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -1932,7 +2084,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2030,143 +2183,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2184,211 +2386,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2397,33 +2700,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2451,7 +2754,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2505,26 +2808,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2534,7 +2837,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2855,47 +3158,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3214,58 +3523,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3345,84 +3672,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3820,11 +4148,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3909,45 +4237,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3976,7 +4308,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4023,148 +4355,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4180,436 +4493,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4795,84 +5073,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4923,44 +5201,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5319,6 +5597,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5556,34 +5838,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5631,7 +5920,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5683,20 +5972,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5704,6 +6000,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5712,6 +6009,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5722,7 +6023,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5733,10 +6034,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/translations/te.po b/src/calibre/translations/te.po
index 0e21dfee56..c73bc644e1 100644
--- a/src/calibre/translations/te.po
+++ b/src/calibre/translations/te.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-15 17:09+0000\n"
+"POT-Creation-Date: 2009-03-25 20:45+0000\n"
 "PO-Revision-Date: 2008-06-24 13:22+0000\n"
 "Last-Translator: వీవెన్ (Veeven) <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-03-20 00:00+0000\n"
+"X-Launchpad-Export-Date: 2009-03-27 02:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -22,13 +22,14 @@ msgid "Does absolutely nothing"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:50
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:196
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:71
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:525
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1049
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1065
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1067
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:528
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1052
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1068
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1070
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
@@ -45,21 +46,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:200
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:263
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:53
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:55
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/mobi.py:148
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:851
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:854
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:60
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:552
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:569
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:574
@@ -67,21 +70,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1153
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftrim.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:33
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:363
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:901
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:948
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:263
@@ -134,27 +141,28 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:126
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:136
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:146
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:156
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:147
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:157
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:167
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:166
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:177
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:186
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:197
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:196
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:207
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:217
-#: /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: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:248
 msgid "Set metadata in %s files"
 msgstr ""
 
@@ -218,17 +226,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:42
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:390
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:72
 msgid "The reader has no storage card connected."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:61
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:90
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:91
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:93
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgstr ""
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:233
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -481,14 +489,14 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:482
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:486
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:758
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:619
 msgid "Output written to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:504
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1152
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:508
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1155
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -507,88 +515,88 @@ msgid ""
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:540
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:933
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:936
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:940
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:943
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:942
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:945
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer.py:566
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:944
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:946
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:949
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:951
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:950
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:953
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:952
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:955
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:954
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:957
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:956
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:959
 msgid "The author(s) of the ebook, as a & separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:958
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:960
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:963
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:962
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:965
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:964
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:967
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:966
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:969
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:971
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:970
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:973
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:976
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:979
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -609,7 +617,7 @@ msgid "%prog [options] LITFILE"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:895
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:569
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:576
 msgid "Output directory. Defaults to current directory."
 msgstr ""
 
@@ -624,7 +632,7 @@ msgid "Useful for debugging."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:912
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:600
 msgid "OEB ebook created in"
 msgstr ""
 
@@ -665,9 +673,9 @@ msgid "Sort key for the author"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:288
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
 msgid "Publisher"
 msgstr "ప్రచురణకర్త"
 
@@ -1393,63 +1401,63 @@ msgstr ""
 msgid "Set the comment"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
 msgid "Title"
 msgstr "శీర్షిక"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:108
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:968
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
 msgid "Author(s)"
 msgstr "రచయిత(లు)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:298
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:290
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:299
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:489
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:322
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "వ్యాఖ్యలు"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:292
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:113
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:911
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:971
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:974
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:304
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:910
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:913
 msgid "Timestamp"
 msgstr ""
 
@@ -1565,7 +1573,7 @@ msgstr ""
 msgid "Set the ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1014
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1581,11 +1589,11 @@ msgstr ""
 msgid "Creating Mobipocket file from EPUB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:567
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:574
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:591
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:598
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1752,97 +1760,101 @@ msgid ""
 "\t"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:549
 msgid "Frequently used directories"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "Send file to storage card instead of main memory by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:32
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "The format to use when saving single files to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Confirm before deleting"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Toolbar icon size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Show button labels in the toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Sort tags list by popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:62
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:64
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68
+msgid "Default action to perform when send to device button is clicked"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:87
 msgid "Added %s to library"
 msgstr ""
@@ -1879,7 +1891,7 @@ msgid "Adding books to database..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:749
 msgid "Reading metadata..."
 msgstr ""
 
@@ -1887,43 +1899,183 @@ msgstr ""
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:84
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:135
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:145
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:163
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:178
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:193
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:203
 msgid "View book on device"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:231
+msgid "Set default send to device action"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:245
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+msgid "Email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:268
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
+msgid "Send specific format to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+msgid "Send specific format to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:399
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:400
+msgid "selected to send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:405
+msgid "Choose format to send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:412
+msgid "No device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
+msgid "Cannot send: No device is connected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:417
+msgid "No card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418
+msgid "Cannot send: Device has no storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449
+msgid "E-book:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Attached, you will find the e-book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:108
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "in the %s format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467
+msgid "Sending email to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:617
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:472
+msgid ""
+"Could not email the following books as no suitable formats were "
+"found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:491
+msgid "Failed to email books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
+msgid "Failed to email the following books:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+msgid "Sent by email:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+msgid "News:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:524
+msgid "Attached is the"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
+msgid "Sent news to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:571
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:614
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:618
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:664
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
@@ -1932,7 +2084,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:317
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 msgid "Formats"
@@ -2030,143 +2183,192 @@ msgstr ""
 msgid "Disable &Trimming"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:102
 msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
-msgid "by"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
+msgid ""
+"Email\n"
+"Delivery"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
-msgid "Advanced"
-msgstr "ఉన్నత"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "General"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:125
 msgid "Interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
+msgid "Advanced"
+msgstr "ఉన్నత"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:126
 msgid "Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Auto send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:144
+msgid "Email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:149
+msgid "Formats to email. The first matching format will be sent."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:150
+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/dialogs/config.py:224
+msgid "new email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:410
+msgid "Finish gmail setup"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:411
+msgid "Dont forget to enter your gmail username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:425
+msgid "Bad configuration"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+msgid "You must set the From email address"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:426
+msgid "You must set the username and password for the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:446
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:447
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:450
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:461
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:462
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:472
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:473
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:476
 msgid "Customize %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:486
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:487
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:509
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:516
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:461
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:565
+msgid "Select database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:582
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:583
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:628
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:624
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:625
+msgid "<br>Must be a directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:629
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
-msgid "Compacting database. This may take a while."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:643
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:644
+msgid "Compacting database. This may take a while."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "Configuration"
 msgstr "స్వరూపణం"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:534
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:535
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:619
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:471
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:499
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:333
@@ -2184,211 +2386,312 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:537
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:538
 msgid ""
 "If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:539
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:540
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:541
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:542
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:543
 msgid " seconds"
 msgstr " క్షణాలు"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:544
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:545
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:546
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:547
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:548
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:550
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:552
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:554
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:555
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:556
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:557
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:558
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:559
 msgid "&Delete news from library when it is sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:560
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:561
 msgid "Toolbar"
 msgstr "పనిముట్ల పట్టీ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:562
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:563
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:564
 msgid "Small"
 msgstr "చిన్న"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:565
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:566
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:567
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:570
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:571
+msgid "calibre can send your books to you (or your reader) by email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:572
+msgid "Send email &from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:573
+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 ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:574
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:575
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:576
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:577
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:578
+msgid ""
+"<p>A mail server is useful if the service you are sending mail to only "
+"accepts email from well know mail services."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:579
+msgid "Mail &Server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:580
+msgid "calibre can <b>optionally</b> use a server to send mail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:581
+msgid "&Hostname:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:582
+msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:583
+msgid "&Port:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:584
+msgid ""
+"The port your mail server listens for connections on. The default is 25"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
+msgid "&Username:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:586
+msgid "Your username on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
+msgid "&Password:"
+msgstr "&సంకేతపదం:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:588
+msgid "Your password on the mail server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:589
+msgid "&Show"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:590
+msgid "&Encryption:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:591
+msgid ""
+"Use TLS encryption when connecting to the mail server. This is the most "
+"common."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:592
+msgid "&TLS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:593
+msgid "Use SSL encryption when connecting to the mail server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:594
+msgid "&SSL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:595
+msgid "Use Gmail"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:596
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:597
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:598
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:599
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:600
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:173
-msgid "&Username:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:174
-msgid "&Password:"
-msgstr "&సంకేతపదం:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:603
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:604
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:175
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:605
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:606
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:607
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:608
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:609
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:610
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:611
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:471
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:612
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2397,33 +2700,33 @@ msgid ""
 "address of this computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:613
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:614
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:474
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:615
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:616
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:476
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:617
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:618
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:620
 msgid "&Add"
 msgstr ""
 
@@ -2451,7 +2754,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:142
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
@@ -2505,26 +2808,26 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:113
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:80
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:81
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:89
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:90
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2534,7 +2837,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:970
 msgid "Cannot convert"
 msgstr ""
 
@@ -2855,47 +3158,53 @@ msgstr ""
 msgid "Level &3 TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
 msgid "Author Sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 msgid "ISBN"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
-msgid "Cannot connect"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:141
+msgid "Finding metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
-msgid "You must specify a valid access key for isbndb.com"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:153
+msgid "Could not find metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-msgid "Error fetching metadata"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:154
+msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163
+msgid "Warning"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:164
+msgid "Could not fetch metadata from:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:168
 msgid "No metadata found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
-msgid "Fetch metadata"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
-msgid "Fetching metadata for <b>%1</b>"
+msgid "Fetch metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
-"Sign up for a free account from <a "
-"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+"<p>calibre can find metadata for your books from two locations: <b>Google "
+"Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a "
+"<a href=\"http://www.isbndb.com\">free account</a> and enter your access key "
+"below."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
@@ -3214,58 +3523,76 @@ msgstr ""
 msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:139
 msgid "No format selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:149
 msgid "Could not read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150
 msgid "Could not read metadata from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:164
 msgid "Could not read cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:159
 msgid "Could not read cover from %s format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "The cover in the %s format is invalid"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:347
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:349
-msgid "Bad cover"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:369
+msgid "Downloading cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:350
-msgid "The cover is not a valid picture"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:389
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:373
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:390
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:364
-msgid "You must specify the ISBN identifier for this book."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:385
+msgid "The download timed out."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:396
+msgid "Bad cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:397
+msgid "The cover is not a valid picture"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
+msgid "Cannot fetch metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:432
+msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:328
@@ -3345,84 +3672,85 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Scheduled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:216
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
 msgid "%d recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Monday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Tuesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "Wednesday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:311
 msgid "day"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Friday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Saturday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Sunday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:312
 msgid "Thursday"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:345
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:346
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:377
 msgid "Created by: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
 msgid "%d days, %d hours and %d minutes ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:419
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:162
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:446
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:448
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:50
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:816
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:820
@@ -3820,11 +4148,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:106
 msgid "No match"
 msgstr ""
 
@@ -3909,45 +4237,49 @@ msgstr ""
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:109
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:972
 msgid "Size (MB)"
 msgstr "పరిమాణం (మెబై)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:970
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:973
 msgid "Date"
 msgstr "తేదీ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:112
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:315
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:321
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:327
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:741
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:745
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:742
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:746
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:962
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3976,7 +4308,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:388
 msgid "No matches found"
 msgstr ""
 
@@ -4023,148 +4355,129 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:92
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:106
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:108
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:111
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "Send to storage card"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:177
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:196
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1267
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1199
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:205
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:274
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:294
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1410
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1362
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:501
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:599
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:622
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -4180,436 +4493,401 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:665
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:717
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:718
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:674
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:719
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:720
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:676
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:721
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:677
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:722
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:680
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
 msgid "Adding books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:746
-msgid "No space on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
-msgid ""
-"<p>Cannot upload books to device there is no more free space available "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:779
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:784
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:791
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:822
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:857
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:823
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1056
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:899
-msgid "Sending news to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:902
-msgid "Choose format to send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
-msgid "Sending books to device."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:959
-msgid "No suitable formats"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:960
-msgid ""
-"Could not upload the following books to the device, as no suitable formats "
-"were found:<br><ul>%s</ul>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:885
 msgid "Saving to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
 msgid "Saved"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:897
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:918
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:944
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1046
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1171
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1201
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1092
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1123
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1142
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1098
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1147
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1220
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1143
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1276
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1209
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1224
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1295
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1234
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1257
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1258
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1360
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1305
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1361
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1306
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1376
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1391
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1395
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1346
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1377
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1324
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1420
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1372
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1462
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1417
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
 msgid ""
 " is communicating with the device!<br>\n"
 "                      'Quitting may cause corruption on the device.<br>\n"
 "                      'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1490
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1448
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1524
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1484
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1503
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1511
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
-msgid "Update available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1561
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1531
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1563
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1533
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid ""
 "Set the output format that is used when converting ebooks and downloading "
 "news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:357
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:358
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:361
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:362
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:363
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Send specific format to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
 msgid "Ctrl+P"
 msgstr ""
 
@@ -4795,84 +5073,84 @@ msgstr ""
 msgid "The standard font type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:165
 msgid "Go to..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:205
 msgid "Position in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:206
 msgid "/Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:217
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:349
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:350
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:389
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:429
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:456
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:516
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:518
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:519
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 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:587
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:592
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4923,44 +5201,44 @@ msgstr ""
 msgid "Toggle full screen"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 msgid "Invalid regular expression"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
 msgid ""
 "Library\n"
 "%d\n"
 "books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
 msgid ""
 "Reader\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
 msgid ""
 "Card\n"
 "%s\n"
 "available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:182
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:183
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -5319,6 +5597,10 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:219
+msgid "Control email delivery"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:83
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:105
 msgid "Unknown feed"
@@ -5556,34 +5838,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:78
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_instapaper.py:56
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:59
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:81
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
-msgid "Spanish"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevnik_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nacional_cro.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vecernji_list.py:26
+msgid "Croatian"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_24sata_rs.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_glas_srpske.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
+msgid "Serbian"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:13
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_adventuregamers.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_amspec.py:14
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ap.py:11
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ars_technica.py:13
@@ -5631,7 +5920,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_miami_herald.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_moscow_times.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nasa.py:34
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_scientist.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_new_yorker.py:16
@@ -5683,20 +5972,27 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_b92.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_blic.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_borba.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_danas.py:22
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_e_novine.py:26
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:30
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_novosti.py:24
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nspm.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pescanik.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_politika.py:23
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pressonline.py:25
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vijesti.py:27
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_vreme.py:26
-msgid "Serbian"
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ambito.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_clarin.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_criticadigital.py:17
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py:61
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_pais.py:14
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_el_universal.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elargentino.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elcronista.py:16
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_elmundo.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_granma.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_infobae.py:21
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_juventudrebelde.py:23
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_cuarta.py:53
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_segunda.py:24
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_tercera.py:64
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:22
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lanacion_chile.py:54
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa.py:60
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pagina12.py:25
+msgid "Spanish"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_courrierinternational.py:18
@@ -5704,6 +6000,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_liberation.py:15
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mediapart.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_mondedurable.py:13
 msgid "French"
 msgstr ""
 
@@ -5712,6 +6009,10 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py:27
+msgid "Bosnian"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_estadao.py:62
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jb_online.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_o_globo.py:69
@@ -5722,7 +6023,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_ftd.py:18
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_heise.py:16
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_spiegelde.py:19
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:19
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_sueddeutsche.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_telepolis.py:17
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_tomshardware_de.py:19
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_zeitde.py:15
@@ -5733,10 +6034,6 @@ msgstr ""
 msgid "Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_jutarnji.py:22
-msgid "Croatian"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_la_republica.py:6
 msgid "Italian"
 msgstr ""
diff --git a/src/calibre/utils/smtp.py b/src/calibre/utils/smtp.py
new file mode 100644
index 0000000000..0234e27c55
--- /dev/null
+++ b/src/calibre/utils/smtp.py
@@ -0,0 +1,240 @@
+from __future__ import with_statement
+__license__ = 'GPL 3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+'''
+This module implements a simple commandline SMTP client that supports:
+
+  * Delivery via an SMTP relay with SSL or TLS
+  * Background delivery with failures being saved in a maildir mailbox
+'''
+
+import sys, traceback, os
+from email import encoders
+
+def create_mail(from_, to, subject, text=None, attachment_data=None,
+                 attachment_type=None, attachment_name=None):
+    assert text or attachment_data
+
+    from email.mime.multipart import MIMEMultipart
+
+    outer = MIMEMultipart()
+    outer['Subject'] = subject
+    outer['To'] = to
+    outer['From'] = from_
+    outer.preamble = 'You will not see this in a MIME-aware mail reader.\n'
+
+    if text is not None:
+        from email.mime.text import MIMEText
+        msg = MIMEText(text)
+        outer.attach(msg)
+
+    if attachment_data is not None:
+        from email.mime.base import MIMEBase
+        assert attachment_data and attachment_name
+        try:
+            maintype, subtype = attachment_type.split('/', 1)
+        except AttributeError:
+            maintype, subtype = 'application', 'octet-stream'
+        msg = MIMEBase(maintype, subtype)
+        msg.set_payload(attachment_data)
+        encoders.encode_base64(msg)
+        msg.add_header('Content-Disposition', 'attachment',
+                       filename=attachment_name)
+        outer.attach(msg)
+
+    return outer.as_string()
+
+def get_mx(host, verbose=0):
+    import dns.resolver
+    if verbose:
+        print 'Find mail exchanger for', host
+    answers = list(dns.resolver.query(host, 'MX'))
+    answers.sort(cmp=lambda x, y: cmp(int(x.preference), int(y.preference)))
+    return [str(x.exchange) for x in answers]
+
+def sendmail_direct(from_, to, msg, timeout, localhost, verbose):
+    import smtplib
+    hosts = get_mx(to.split('@')[-1].strip(), verbose)
+    timeout=None # Non blocking sockets sometimes don't work
+    s = smtplib.SMTP(timeout=timeout, local_hostname=localhost)
+    s.set_debuglevel(verbose)
+    if not hosts:
+        raise ValueError('No mail server found for address: %s'%to)
+    last_error = last_traceback = None
+    for host in hosts:
+        try:
+            s.connect(host, 25)
+            s.sendmail(from_, [to], msg)
+            return s.quit()
+        except Exception, e:
+            last_error, last_traceback = e, traceback.format_exc()
+    if last_error is not None:
+        print last_traceback
+        raise IOError('Failed to send mail: '+repr(last_error))
+
+
+def sendmail(msg, from_, to, localhost=None, verbose=0, timeout=30,
+             relay=None, username=None, password=None, encryption='TLS',
+             port=-1):
+    if relay is None:
+        for x in to:
+            return sendmail_direct(from_, x, msg, timeout, localhost, verbose)
+    import smtplib
+    cls = smtplib.SMTP if encryption == 'TLS' else smtplib.SMTP_SSL
+    timeout = None # Non-blocking sockets sometimes don't work
+    port = int(port)
+    s = cls(timeout=timeout, local_hostname=localhost)
+    s.set_debuglevel(verbose)
+    if port < 0:
+        port = 25 if encryption == 'TLS' else 465
+    s.connect(relay, port)
+    if encryption == 'TLS':
+        s.starttls()
+        s.ehlo()
+    if username is not None and password is not None:
+        s.login(username, password)
+    s.sendmail(from_, to, msg)
+    return s.quit()
+
+def option_parser():
+    try:
+        from calibre.utils.config import OptionParser
+        OptionParser
+    except ImportError:
+        from optparse import OptionParser
+    import textwrap
+    parser = OptionParser(textwrap.dedent('''\
+    %prog [options] [from to text]
+
+    Send mail using the SMTP protocol. %prog has two modes of operation. In the
+    compose mode you specify from to and text and these are used to build and
+    send an email message. In the filter mode, %prog reads a complete email
+    message from STDIN and sends it.
+
+    text is the body of the email message.
+    If text is not specified, a complete email message is read from STDIN.
+    from is the email address of the sender and to is the email address
+    of the recipient. When a complete email is read from STDIN, from and to
+    are only used in the SMTP negotiation, the message headers are not modified.
+    '''))
+    c=parser.add_option_group('COMPOSE MAIL',
+        'Options to compose an email. Ignored if text is not specified').add_option
+    c('-a', '--attachment', help='File to attach to the email')
+    c('-s', '--subject', help='Subject of the email')
+
+    parser.add_option('-l', '--localhost',
+                      help=('Host name of localhost. Used when connecting '
+                            'to SMTP server.'))
+    r=parser.add_option_group('SMTP RELAY',
+        'Options to use an SMTP relay server to send mail. '
+        '%prog will try to send the email directly unless --relay is '
+        'specified.').add_option
+    r('-r', '--relay', help=('An SMTP relay server to use to send mail.'))
+    r('-p', '--port', default=-1,
+      help='Port to connect to on relay server. Default is to use 465 if '
+      'encryption method is SSL and 25 otherwise.')
+    r('-u', '--username', help='Username for relay')
+    r('-p', '--password', help='Password for relay')
+    r('-e', '--encryption-method', default='TLS',
+      choices=['TLS', 'SSL'],
+      help='Encryption method to use when connecting to relay. Choices are '
+      'TLS and SSL. Default is TLS.')
+    parser.add_option('-o', '--outbox', help='Path to maildir folder to store '
+                      'failed email messages in.')
+    parser.add_option('-f', '--fork', default=False, action='store_true',
+                      help='Fork and deliver message in background. '
+                      'If you use this option, you should also use --outbox '
+                      'to handle delivery failures.')
+    parser.add_option('-t', '--timeout', help='Timeout for connection')
+    parser.add_option('-v', '--verbose', default=0, action='count',
+                      help='Be more verbose')
+    return parser
+
+def extract_email_address(raw):
+    from email.utils import parseaddr
+    return parseaddr(raw)[-1]
+
+def compose_mail(from_, to, text, subject=None, attachment=None,
+        attachment_name=None):
+    attachment_type = attachment_data = None
+    if attachment is not None:
+        try:
+            from calibre import guess_type
+            guess_type
+        except ImportError:
+            from mimetypes import guess_type
+        attachment_data = attachment.read() if hasattr(attachment, 'read') \
+                            else open(attachment, 'rb').read()
+        attachment_type = guess_type(getattr(attachment, 'name', attachment))[0]
+        if attachment_name is None:
+            attachment_name = os.path.basename(getattr(attachment,
+                'name', attachment))
+    subject = subject if subject else 'no subject'
+    return create_mail(from_, to, subject, text=text,
+            attachment_data=attachment_data, attachment_type=attachment_type,
+            attachment_name=attachment_name)
+
+def main(args=sys.argv):
+    parser = option_parser()
+    opts, args = parser.parse_args(args)
+
+
+    if len(args) > 1:
+        msg = compose_mail(args[1], args[2], args[3], subject=opts.subject,
+                           attachment=opts.attachment)
+        from_, to = args[1:3]
+        efrom, eto = map(extract_email_address, (from_, to))
+        eto = [eto]
+    else:
+        msg = sys.stdin.read()
+        from email.parser import Parser
+        from email.utils import getaddresses
+        eml = Parser.parsestr(msg, headersonly=True)
+        tos = eml.get_all('to', [])
+        ccs = eml.get_all('cc', [])
+        eto = getaddresses(tos + ccs)
+        if not eto:
+            raise ValueError('Email from STDIN does not specify any recipients')
+        efrom = getaddresses(eml.get_all('from', []))
+        if not efrom:
+            raise ValueError('Email from STDIN does not specify a sender')
+        efrom = efrom[0]
+
+
+    outbox = None
+    if opts.outbox is not None:
+        outbox = os.path.abspath(os.path.expanduser(opts.outbox))
+        from mailbox import Maildir
+        outbox = Maildir(opts.outbox, factory=None)
+    if opts.fork:
+        if os.fork() != 0:
+            return 0
+    try:
+        sendmail(msg, efrom, eto, localhost=opts.localhost, verbose=opts.verbose,
+             timeout=opts.timeout, relay=opts.relay, username=opts.username,
+             password=opts.password, port=opts.port,
+             encryption=opts.encryption_method)
+    except:
+        if outbox is not None:
+            outbox.add(msg)
+            print 'Delivery failed. Message saved to', opts.outbox
+        raise
+    return 0
+
+def config(defaults=None):
+    from calibre.utils.config import Config, StringConfig
+    desc = _('Control email delivery')
+    c = Config('smtp',desc) if defaults is None else StringConfig(defaults,desc)
+    c.add_opt('from_')
+    c.add_opt('accounts', default={})
+    c.add_opt('relay_host')
+    c.add_opt('relay_port', default=25)
+    c.add_opt('relay_username')
+    c.add_opt('relay_password')
+    c.add_opt('encryption', default='TLS', choices=['TLS', 'SSL'])
+    return c
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index bcc3cb050d..a73be2edd6 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -36,131 +36,131 @@ class BasicNewsRecipe(object):
     '''
     Abstract base class that contains logic needed in all feed fetchers.
     '''
-    
+
     #: The title to use for the ebook
     title                  = _('Unknown News Source')
-    
+
     #: A couple of lines that describe the content this recipe downloads.
     #: This will be used primarily in a GUI that presents a list of recipes.
     description = ''
-    
+
     #: The author of this recipe
-    __author__             = __appname__    
-    
+    __author__             = __appname__
+
     #: The language that the news is in
     language               = _('Unknown')
-    
+
     #: Maximum number of articles to download from each feed. This is primarily
     #: useful for feeds that don't have article dates. For most feeds, you should
     #: use :attr:`BasicNewsRecipe.oldest_article`
     max_articles_per_feed  = 100
-    
+
     #: Oldest article to download from this news source. In days.
-    oldest_article         = 7.0 
-    
-    #: Number of levels of links to follow on article webpages 
+    oldest_article         = 7.0
+
+    #: Number of levels of links to follow on article webpages
     recursions             = 0
-    
+
     #: Delay between consecutive downloads in seconds
     delay                  = 0
-    
+
     #: Number of simultaneous downloads. Set to 1 if the server is picky.
     #: Automatically reduced to 1 if :attr:`BasicNewsRecipe.delay` > 0
     simultaneous_downloads = 5
-    
+
     #: If False the remote server is contacted by only one thread at a time
     multithreaded_fetch = False
-    
+
     #: Timeout for fetching files from server in seconds
     timeout                = 120.0
-    
+
     #: The format string for the date shown on the first page.
     #: By default: Day_Name, Day_Number Month_Name Year
     timefmt                = ' [%a, %d %b %Y]'
-    
+
     #: List of feeds to download
     #: Can be either ``[url1, url2, ...]`` or ``[('title1', url1), ('title2', url2),...]``
     feeds = None
-    
+
     #: Max number of characters in the short description
     summary_length         = 500
-    
+
     #: Convenient flag to disable loading of stylesheets for websites
     #: that have overly complex stylesheets unsuitable for conversion
     #: to ebooks formats
     #: If True stylesheets are not downloaded and processed
     no_stylesheets         = False
-    
+
     #: Convenient flag to strip all javascript tags from the downloaded HTML
     remove_javascript      = True
-    
-    #: If True the GUI will ask the user for a username and password 
+
+    #: If True the GUI will ask the user for a username and password
     #: to use while downloading
     #: @type: boolean
     needs_subscription     = False
-    
+
     #: If True the navigation bar is center aligned, otherwise it is left aligned
     center_navbar = True
-    
+
     #: Specify an override encoding for sites that have an incorrect
     #: charset specification. The most common being specifying ``latin1`` and
-    #: using ``cp1252``. If None, try to detect the encoding. 
+    #: using ``cp1252``. If None, try to detect the encoding.
     encoding               = None
-    
+
     #: Normally we try to guess if a feed has full articles embedded in it
     #: based on the length of the embedded content. If `None`, then the
-    #: default guessing is used. If `True` then the we always assume the feeds has 
+    #: default guessing is used. If `True` then the we always assume the feeds has
     #: embedded content and if `False` we always assume the feed does not have
     #: embedded content.
     use_embedded_content   = None
-    
+
     #: Set to True and implement :method:`get_obfuscated_article` to handle
     #: websites that try to make it difficult to scrape content.
     articles_are_obfuscated = False
-    
+
     #: Specify any extra :term:`CSS` that should be addded to downloaded :term:`HTML` files
     #: It will be inserted into `<style>` tags, just before the closing
     #: `</head>` tag thereby overriding all :term:`CSS` except that which is
-    #: declared using the style attribute on individual :term:`HTML` tags. 
+    #: declared using the style attribute on individual :term:`HTML` tags.
     #: For example::
-    #: 
+    #:
     #:     extra_css = '.heading { font: serif x-large }'
-    #: 
+    #:
     extra_css              = None
-    
+
     #: List of regular expressions that determines which links to follow
     #: If empty, it is ignored. For example::
-    #:    
+    #:
     #:     match_regexps = [r'page=[0-9]+']
     #:
     #: will match all URLs that have `page=some number` in them.
     #:
-    #: Only one of :attr:`BasicNewsRecipe.match_regexps` or 
+    #: Only one of :attr:`BasicNewsRecipe.match_regexps` or
     #: :attr:`BasicNewsRecipe.filter_regexps` should be defined.
     match_regexps         = []
-    
+
     #: List of regular expressions that determines which links to ignore
     #: If empty it is ignored. For example::
-    #:     
+    #:
     #:     filter_regexps = [r'ads\.doubleclick\.net']
     #:
     #: will remove all URLs that have `ads.doubleclick.net` in them.
-    #: 
-    #: Only one of :attr:`BasicNewsRecipe.match_regexps` or 
+    #:
+    #: Only one of :attr:`BasicNewsRecipe.match_regexps` or
     #: :attr:`BasicNewsRecipe.filter_regexps` should be defined.
     filter_regexps        = []
-    
+
     #: List of options to pass to html2lrf, to customize generation of LRF ebooks.
     html2lrf_options      = []
-    
+
     #: Options to pass to html2epub to customize generation of EPUB ebooks.
     html2epub_options     = ''
     #: Options to pass to oeb2mobi to customize generation of MOBI ebooks.
     oeb2mobi_options     = ''
-    
+
     #: List of tags to be removed. Specified tags are removed from downloaded HTML.
     #: A tag is specified as a dictionary of the form::
-    #:    
+    #:
     #:    {
     #:     name      : 'tag name',   #e.g. 'div'
     #:     attrs     : a dictionary, #e.g. {class: 'advertisment'}
@@ -169,14 +169,14 @@ class BasicNewsRecipe(object):
     #: All keys are optional. For a full explanantion of the search criteria, see
     #: `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/documentation.html#The basic find method: findAll(name, attrs, recursive, text, limit, **kwargs)>`_
     #: A common example::
-    #: 
+    #:
     #:   remove_tags = [dict(name='div', attrs={'class':'advert'})]
-    #: 
-    #: This will remove all `<div class="advert">` tags and all 
+    #:
+    #: This will remove all `<div class="advert">` tags and all
     #: their children from the downloaded :term:`HTML`.
     remove_tags           = []
-    
-    #: Remove all tags that occur after the specified tag. 
+
+    #: Remove all tags that occur after the specified tag.
     #: For the format for specifying a tag see :attr:`BasicNewsRecipe.remove_tags`.
     #: For example::
     #:
@@ -185,7 +185,7 @@ class BasicNewsRecipe(object):
     #: will remove all
     #: tags after the first element with `id="content"`.
     remove_tags_after     = None
-    
+
     #: Remove all tags that occur before the specified tag.
     #: For the format for specifying a tag see :attr:`BasicNewsRecipe.remove_tags`.
     #: For example::
@@ -195,59 +195,59 @@ class BasicNewsRecipe(object):
     #: will remove all
     #: tags before the first element with `id="content"`.
     remove_tags_before    = None
-    
-    #: Keep only the specified tags and their children. 
+
+    #: Keep only the specified tags and their children.
     #: For the format for specifying a tag see :attr:`BasicNewsRecipe.remove_tags`.
     #: If this list is not empty, then the `<body>` tag will be emptied and re-filled with
     #: the tags that match the entries in this list. For example::
-    #: 
+    #:
     #:     keep_only_tags = [dict(id=['content', 'heading'])]
-    #: 
+    #:
     #: will keep only tags that have an `id` attribute of `"content"` or `"heading"`.
     keep_only_tags        = []
-    
-    #: List of :term:`regexp` substitution rules to run on the downloaded :term:`HTML`. 
-    #: Each element of the 
+
+    #: List of :term:`regexp` substitution rules to run on the downloaded :term:`HTML`.
+    #: Each element of the
     #: list should be a two element tuple. The first element of the tuple should
     #: be a compiled regular expression and the second a callable that takes
     #: a single match object and returns a string to replace the match. For example::
     #:
     #:     preprocess_regexps = [
-    #:        (re.compile(r'<!--Article ends here-->.*</body>', re.DOTALL|re.IGNORECASE), 
+    #:        (re.compile(r'<!--Article ends here-->.*</body>', re.DOTALL|re.IGNORECASE),
     #:         lambda match: '</body>'),
     #:     ]
     #:
     #: will remove everythong from `<!--Article ends here-->` to `</body>`.
     preprocess_regexps    = []
-    
+
     #: The CSS that is used to styles the templates, i.e., the navigation bars and
     #: the Tables of Contents. Rather than overriding this variable, you should
-    #: use :member:`extra_css` in your recipe to customize look and feel. 
+    #: use :member:`extra_css` in your recipe to customize look and feel.
     template_css = u'''
             .article_date {
                 font-size: x-small; color: gray; font-family: monospace;
             }
-            
+
             .article_description {
                 font-size: small; font-family: sans; text-indent: 0pt;
             }
-            
+
             a.article {
                 font-weight: bold; font-size: large;
             }
-            
+
             a.feed {
                 font-weight: bold; font-size: large;
             }
-            
+
             .navbar {
                 font-family:monospace; font-size:8pt
             }
 '''
 
-    
+
     # See the built-in profiles for examples of these settings.
-    
+
     def get_cover_url(self):
         '''
         Return a :term:`URL` to the cover image for this issue or `None`.
@@ -257,7 +257,7 @@ class BasicNewsRecipe(object):
         before this method is called.
         '''
         return getattr(self, 'cover_url', None)
-    
+
     def get_feeds(self):
         '''
         Return a list of :term:RSS feeds to fetch for this profile. Each element of the list
@@ -271,28 +271,28 @@ class BasicNewsRecipe(object):
         if self.test:
             return self.feeds[:2]
         return self.feeds
-    
+
     @classmethod
     def print_version(self, url):
         '''
-        Take a `url` pointing to the webpage with article content and return the 
+        Take a `url` pointing to the webpage with article content and return the
         :term:`URL` pointing to the print version of the article. By default does
         nothing. For example::
-        
+
             def print_version(self, url):
                 return url + '?&pagewanted=print'
-        
+
         '''
         raise NotImplementedError
-    
+
     @classmethod
     def image_url_processor(cls, baseurl, url):
         '''
-        Perform some processing on image urls (perhaps removing size restrictions for 
+        Perform some processing on image urls (perhaps removing size restrictions for
         dynamically generated images, etc.) and return the precessed URL.
         '''
         return url
-    
+
     @classmethod
     def get_browser(cls, *args, **kwargs):
         '''
@@ -300,11 +300,11 @@ class BasicNewsRecipe(object):
         it returns a `mechanize <http://wwwsearch.sourceforge.net/mechanize/>`_
         browser instance that supports cookies, ignores robots.txt, handles
         refreshes and has a mozilla firefox user agent.
-        
+
         If your recipe requires that you login first, override this method
         in your subclass. For example, the following code is used in the New York
         Times recipe to login for full access::
-        
+
             def get_browser(self):
                 br = BasicNewsRecipe.get_browser()
                 if self.username is not None and self.password is not None:
@@ -314,58 +314,58 @@ class BasicNewsRecipe(object):
                     br['PASSWORD'] = self.password
                     br.submit()
                 return br
-        
+
         '''
         return browser(*args, **kwargs)
-    
+
     def get_article_url(self, article):
         '''
         Override in a subclass to customize extraction of the :term:`URL` that points
-        to the content for each article. Return the 
+        to the content for each article. Return the
         article URL. It is called with `article`, an object representing a parsed article
         from a feed. See `feedsparser <http://www.feedparser.org/docs/>`_.
         By default it returns `article.link <http://www.feedparser.org/docs/reference-entry-link.html>`_.
         '''
         return article.get('link',  None)
-    
+
     def preprocess_html(self, soup):
         '''
         This method is called with the source of each downloaded :term:`HTML` file, before
-        it is parsed for links and images. 
+        it is parsed for links and images.
         It can be used to do arbitrarily powerful pre-processing on the :term:`HTML`.
         It should return `soup` after processing it.
-        
-        `soup`: A `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_ 
+
+        `soup`: A `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_
         instance containing the downloaded :term:`HTML`.
         '''
         return soup
-    
+
     def postprocess_html(self, soup, first_fetch):
         '''
         This method is called with the source of each downloaded :term:`HTML` file, after
-        it is parsed for links and images. 
+        it is parsed for links and images.
         It can be used to do arbitrarily powerful post-processing on the :term:`HTML`.
-        It should return `soup` after processing it. 
-        
+        It should return `soup` after processing it.
+
         :param soup: A `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_  instance containing the downloaded :term:`HTML`.
         :param first_fetch: True if this is the first page of an article.
 
         '''
         return soup
-    
+
     def cleanup(self):
         '''
-        Called after all articles have been download. Use it to do any cleanup like 
+        Called after all articles have been download. Use it to do any cleanup like
         logging out of subscription sites, etc.
         '''
         pass
-    
+
     def index_to_soup(self, url_or_raw, raw=False):
         '''
         Convenience method that takes an URL to the index page and returns
         a `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_
         of it.
-        
+
         `url_or_raw`: Either a URL or the downloaded index page as a string
         '''
         if re.match(r'\w+://', url_or_raw):
@@ -379,39 +379,39 @@ class BasicNewsRecipe(object):
         if raw:
             return _raw
         if not isinstance(_raw, unicode) and self.encoding:
-            _raw = _raw.decode(self.encoding)
+            _raw = _raw.decode(self.encoding, 'replace')
         massage = list(BeautifulSoup.MARKUP_MASSAGE)
-        massage.append((re.compile(r'&(\S+?);'), lambda match: entity_to_unicode(match, encoding=self.encoding))) 
+        massage.append((re.compile(r'&(\S+?);'), lambda match: entity_to_unicode(match, encoding=self.encoding)))
         return BeautifulSoup(_raw, markupMassage=massage)
-        
-    
+
+
     def sort_index_by(self, index, weights):
         '''
         Convenience method to sort the titles in `index` according to `weights`.
         `index` is sorted in place. Returns `index`.
-        
+
         `index`: A list of titles.
-        
+
         `weights`: A dictionary that maps weights to titles. If any titles
         in index are not in weights, they are assumed to have a weight of 0.
         '''
         weights = defaultdict(lambda : 0, weights)
         index.sort(cmp=lambda x, y: cmp(weights[x], weights[y]))
         return index
-    
+
     def parse_index(self):
         '''
         This method should be implemented in recipes that parse a website
         instead of feeds to generate a list of articles. Typical uses are for
-        news sources that have a "Print Edition" webpage that lists all the 
+        news sources that have a "Print Edition" webpage that lists all the
         articles in the current print edition. If this function is implemented,
         it will be used in preference to :meth:`BasicNewsRecipe.parse_feeds`.
-        
+
         It must return a list. Each element of the list must be a 2-element tuple
         of the form ``('feed title', list of articles)``.
-         
+
         Each list of articles must contain dictionaries of the form::
-        
+
             {
             'title'       : article title,
             'url'         : URL of print version,
@@ -419,106 +419,106 @@ class BasicNewsRecipe(object):
             'description' : A summary of the article
             'content'     : The full article (can be an empty string). This is used by FullContentProfile
             }
-        
+
         For an example, see the recipe for downloading `The Atlantic`.
         '''
         raise NotImplementedError
-    
+
     def get_obfuscated_article(self, url, logger):
         '''
         If you set :member:`articles_are_obfuscated` this method is called with
         every article URL. It should return the path to a file on the filesystem
         that contains the article HTML. That file is processed by the recursive
         HTML fetching engine, so it can contain links to pages/images on the web.
-        
+
         This method is typically useful for sites that try to make it difficult to
-        access article content automatically. See for example the 
+        access article content automatically. See for example the
         :module:`calibre.web.recipes.iht` recipe.
         '''
         raise NotImplementedError
-    
+
     def __init__(self, options, parser, progress_reporter):
         '''
         Initialize the recipe.
-        :param options: Parsed commandline options 
+        :param options: Parsed commandline options
         :param parser:  Command line option parser. Used to intelligently merge options.
         :param progress_reporter: A Callable that takes two arguments: progress (a number between 0 and 1) and a string message. The message should be optional.
         '''
         if not isinstance(self.title, unicode):
             self.title = unicode(self.title, 'utf-8', 'replace')
-        
+
         for attr in ('username', 'password', 'lrf', 'output_dir', 'verbose', 'debug', 'test'):
             setattr(self, attr, getattr(options, attr))
         self.output_dir = os.path.abspath(self.output_dir)
         if options.test:
             self.max_articles_per_feed = 2
             self.simultaneous_downloads = min(4, self.simultaneous_downloads)
-        
-        
+
+
         if self.debug:
             logging.getLogger('feeds2disk').setLevel(logging.DEBUG)
             self.verbose = True
         self.report_progress = progress_reporter
-        
+
         self.username = self.password = None
         #: If True optimize downloading for eventual conversion to LRF
         self.lrf = False
         defaults = parser.get_default_values()
-        
+
         for opt in options.__dict__.keys():
             if getattr(options, opt) != getattr(defaults, opt, None):
                 setattr(self, opt, getattr(options, opt))
-        
+
         if isinstance(self.feeds, basestring):
             self.feeds = eval(self.feeds)
             if isinstance(self.feeds, basestring):
                 self.feeds = [self.feeds]
-            
+
         if self.needs_subscription and (self.username is None or self.password is None):
             raise ValueError('The %s recipe needs a username and password.'%self.title)
-        
+
         self.browser = self.get_browser()
         self.image_map, self.image_counter = {}, 1
         self.css_map = {}
-        
-        web2disk_cmdline = [ 'web2disk', 
+
+        web2disk_cmdline = [ 'web2disk',
             '--timeout', str(self.timeout),
             '--max-recursions', str(self.recursions),
             '--delay', str(self.delay),
-            '--timeout', str(self.timeout),            
+            '--timeout', str(self.timeout),
             ]
         if self.encoding is not None:
             web2disk_cmdline.extend(['--encoding', self.encoding])
-        
+
         if self.verbose:
             web2disk_cmdline.append('--verbose')
-            
+
         if self.no_stylesheets:
             web2disk_cmdline.append('--dont-download-stylesheets')
-            
+
         for reg in self.match_regexps:
             web2disk_cmdline.extend(['--match-regexp', reg])
-            
+
         for reg in self.filter_regexps:
             web2disk_cmdline.extend(['--filter-regexp', reg])
-            
+
         self.web2disk_options = web2disk_option_parser().parse_args(web2disk_cmdline)[0]
-        for extra in ('keep_only_tags', 'remove_tags', 'preprocess_regexps', 
+        for extra in ('keep_only_tags', 'remove_tags', 'preprocess_regexps',
                       'preprocess_html', 'remove_tags_after', 'remove_tags_before'):
             setattr(self.web2disk_options, extra, getattr(self, extra))
         self.web2disk_options.postprocess_html = self._postprocess_html
-        
+
         if self.delay > 0:
             self.simultaneous_downloads = 1
-            
+
         self.navbar = templates.NavBarTemplate()
         self.html2lrf_options.extend(['--page-break-before', '$', '--use-spine', '--header', '--encoding', 'utf-8'])
         if '--base-font-size' not in self.html2lrf_options:
             self.html2lrf_options.extend(['--base-font-size', '12'])
         self.failed_downloads = []
         self.partial_failures = []
-                
-            
+
+
     def _postprocess_html(self, soup, first_fetch, job_info):
         if self.no_stylesheets:
             for link in list(soup.findAll('link', type=re.compile('css')))+list(soup.findAll('style')):
@@ -534,9 +534,9 @@ class BasicNewsRecipe(object):
             url, f, a, feed_len = job_info
             body = soup.find('body')
             if body is not None:
-                templ = self.navbar.generate(False, f, a, feed_len, 
-                                             not self.has_single_feed, 
-                                             url, __appname__, 
+                templ = self.navbar.generate(False, f, a, feed_len,
+                                             not self.has_single_feed,
+                                             url, __appname__,
                                              center=self.center_navbar,
                                              extra_css=self.extra_css)
                 elem = BeautifulSoup(templ.render(doctype='xhtml').decode('utf-8')).find('div')
@@ -547,11 +547,11 @@ class BasicNewsRecipe(object):
         for script in list(soup.findAll('noscript')):
                 script.extract()
         return self.postprocess_html(soup, first_fetch)
-        
-    
+
+
     def download(self, for_lrf=False):
         '''
-        Download and pre-process all articles from the feeds in this recipe. 
+        Download and pre-process all articles from the feeds in this recipe.
         This method should be called only one on a particular Recipe instance.
         Calling it more than once will lead to undefined behavior.
         @return: Path to index.html
@@ -574,16 +574,16 @@ class BasicNewsRecipe(object):
                     self.log_warning(_('\tFailed links:'))
                     for l, tb in debug:
                         self.log_warning(l)
-                        self.log_debug(tb) 
+                        self.log_debug(tb)
             return res
         finally:
             self.cleanup()
-    
+
     def feeds2index(self, feeds):
         templ = templates.IndexTemplate()
         return templ.generate(self.title, self.timefmt, feeds,
                               extra_css=self.extra_css).render(doctype='xhtml')
-    
+
     @classmethod
     def description_limiter(cls, src):
         if not src:
@@ -604,14 +604,14 @@ class BasicNewsRecipe(object):
             return ans+u'\u2026' if isinstance(ans, unicode) else ans + '...'
         return ans
 
-        
-    
+
+
     def feed2index(self, feed):
         if feed.image_url is not None: # Download feed image
             imgdir = os.path.join(self.output_dir, 'images')
             if not os.path.isdir(imgdir):
                 os.makedirs(imgdir)
-        
+
             if self.image_map.has_key(feed.image_url):
                 feed.image_url = self.image_map[feed.image_url]
             else:
@@ -630,13 +630,13 @@ class BasicNewsRecipe(object):
                             pass
             if isinstance(feed.image_url, str):
                 feed.image_url = feed.image_url.decode(sys.getfilesystemencoding(), 'strict')
-                
-                
+
+
         templ = templates.FeedTemplate()
-        return templ.generate(feed, self.description_limiter, 
+        return templ.generate(feed, self.description_limiter,
                               extra_css=self.extra_css).render(doctype='xhtml')
-        
-    
+
+
     def create_logger(self, feed_number, article_number):
         logger = logging.getLogger('feeds2disk.article_%d_%d'%(feed_number, article_number))
         out = cStringIO.StringIO()
@@ -647,7 +647,7 @@ class BasicNewsRecipe(object):
             handler.setLevel(logging.DEBUG)
         logger.addHandler(handler)
         return logger, out
-    
+
     def _fetch_article(self, url, dir, logger, f, a, num_of_feeds):
         self.web2disk_options.browser = self.get_browser() if self.multithreaded_fetch else self.browser
         fetcher = RecursiveFetcher(self.web2disk_options, logger, self.image_map, self.css_map, (url, f, a, num_of_feeds))
@@ -661,15 +661,15 @@ class BasicNewsRecipe(object):
         if not res or not os.path.exists(res):
             raise Exception(_('Could not fetch article. Run with --debug to see the reason'))
         return res, path, failures
-    
+
     def fetch_article(self, url, dir, logger, f, a, num_of_feeds):
         return self._fetch_article(url, dir, logger, f, a, num_of_feeds)
-    
+
     def fetch_obfuscated_article(self, url, dir, logger, f, a, num_of_feeds):
         path = os.path.abspath(self.get_obfuscated_article(url, logger))
         url = ('file:'+path) if iswindows else ('file://'+path)
         return self._fetch_article(url, dir, logger, f, a, num_of_feeds)
-    
+
     def fetch_embedded_article(self, article, dir, logger, f, a, num_of_feeds):
         templ = templates.EmbeddedContent()
         raw = templ.generate(article).render('html')
@@ -677,8 +677,8 @@ class BasicNewsRecipe(object):
             pt.write(raw)
             url = ('file:'+pt.name) if iswindows else ('file://'+pt.name)
         return self._fetch_article(url, dir, logger, f, a, num_of_feeds)
-        
-    
+
+
     def build_index(self):
         self.report_progress(0, _('Fetching feeds...'))
         try:
@@ -687,30 +687,30 @@ class BasicNewsRecipe(object):
             self.report_progress(0, _('Got feeds from index page'))
         except NotImplementedError:
             feeds = self.parse_feeds()
-        
+
         #feeds = FeedCollection(feeds)
-        
+
         self.report_progress(0, _('Trying to download cover...'))
         self.download_cover()
         if self.test:
             feeds = feeds[:2]
         self.has_single_feed = len(feeds) == 1
-        
+
         if self.use_embedded_content is None:
             self.use_embedded_content = feeds[0].has_embedded_content()
-        
-        index = os.path.join(self.output_dir, 'index.html') 
-        
+
+        index = os.path.join(self.output_dir, 'index.html')
+
         html = self.feeds2index(feeds)
         with open(index, 'wb') as fi:
             fi.write(html)
-        
+
         self.jobs = []
         for f, feed in enumerate(feeds):
             feed_dir = os.path.join(self.output_dir, 'feed_%d'%f)
             if not os.path.isdir(feed_dir):
                 os.makedirs(feed_dir)
-                
+
             for a, article in enumerate(feed):
                 if a >= self.max_articles_per_feed:
                     break
@@ -727,22 +727,22 @@ class BasicNewsRecipe(object):
                 func, arg = (self.fetch_embedded_article, article) if self.use_embedded_content else \
                             ((self.fetch_obfuscated_article if self.articles_are_obfuscated \
                               else self.fetch_article), url)
-                req = WorkRequest(func, (arg, art_dir, logger, f, a, len(feed)), 
-                                      {}, (f, a), self.article_downloaded, 
+                req = WorkRequest(func, (arg, art_dir, logger, f, a, len(feed)),
+                                      {}, (f, a), self.article_downloaded,
                                       self.error_in_article_download)
                 req.stream = stream
                 req.feed = feed
                 req.article = article
                 req.feed_dir = feed_dir
                 self.jobs.append(req)
-            
-                    
+
+
         self.jobs_done = 0
         tp = ThreadPool(self.simultaneous_downloads)
         for req in self.jobs:
             tp.putRequest(req, block=True, timeout=0)
-        
-        
+
+
         self.report_progress(0, _('Starting download [%d thread(s)]...')%self.simultaneous_downloads)
         while True:
             try:
@@ -750,9 +750,9 @@ class BasicNewsRecipe(object):
                 time.sleep(0.1)
             except NoResultsPending:
                 break
-        
+
         #feeds.restore_duplicates()
-        
+
         for f, feed in enumerate(feeds):
             html = self.feed2index(feed)
             feed_dir = os.path.join(self.output_dir, 'feed_%d'%f)
@@ -760,9 +760,9 @@ class BasicNewsRecipe(object):
                 fi.write(html)
         self.create_opf(feeds)
         self.report_progress(1, _('Feeds downloaded to %s')%index)
-        
+
         return index
-    
+
     def download_cover(self):
         self.cover_path = None
         try:
@@ -781,8 +781,8 @@ class BasicNewsRecipe(object):
             with nested(open(cpath, 'wb'), closing(self.browser.open(cu))) as (cfile, r):
                 cfile.write(r.read())
             self.cover_path = cpath
-            
-    
+
+
     def default_cover(self, cover_file):
         '''
         Create a generic cover for recipes that dont have a cover
@@ -829,9 +829,9 @@ class BasicNewsRecipe(object):
                 </div>
             </body>
         </html>
-        '''%dict(title=self.title if isinstance(self.title, unicode) else self.title.decode(preferred_encoding, 'replace'), 
+        '''%dict(title=self.title if isinstance(self.title, unicode) else self.title.decode(preferred_encoding, 'replace'),
                  author=self.__author__ if isinstance(self.__author__, unicode) else self.__author__.decode(preferred_encoding, 'replace'),
-                 date=strftime(self.timefmt), 
+                 date=strftime(self.timefmt),
                  app=__appname__ +' '+__version__,
                  img=img)
         f2 = tempfile.NamedTemporaryFile(suffix='cover.html')
@@ -862,12 +862,12 @@ class BasicNewsRecipe(object):
                 cover_file.flush()
             finally:
                 loop.exit(0)
-    
+
         page.connect(page, SIGNAL('loadFinished(bool)'), functools.partial(render_html, page, loop))
         page.mainFrame().load(QUrl.fromLocalFile(f2.name))
         loop.exec_()
 
-    
+
     def create_opf(self, feeds, dir=None):
         if dir is None:
             dir = self.output_dir
@@ -877,7 +877,7 @@ class BasicNewsRecipe(object):
         opf_path = os.path.join(dir, 'index.opf')
         ncx_path = os.path.join(dir, 'index.ncx')
         opf = OPFCreator(dir, mi)
-        
+
         manifest = [os.path.join(dir, 'feed_%d'%i) for i in range(len(feeds))]
         manifest.append(os.path.join(dir, 'index.html'))
         manifest.append(os.path.join(dir, 'index.ncx'))
@@ -893,12 +893,12 @@ class BasicNewsRecipe(object):
         for mani in opf.manifest:
             if mani.path.endswith('.ncx'):
                 mani.id = 'ncx'
-        
+
         entries = ['index.html']
         toc = TOC(base_path=dir)
         self.play_order_counter = 0
         self.play_order_map = {}
-        
+
         def feed_index(num, parent):
             f = feeds[num]
             for j, a in enumerate(f):
@@ -917,7 +917,7 @@ class BasicNewsRecipe(object):
                         relp = sp[len(prefix):]
                         entries.append(relp.replace(os.sep, '/'))
                         last = sp
-                    
+
                     if os.path.exists(last):
                         with open(last, 'rb') as fi:
                             src = fi.read().decode('utf-8')
@@ -925,15 +925,15 @@ class BasicNewsRecipe(object):
                         body = soup.find('body')
                         if body is not None:
                             prefix = '/'.join('..'for i in range(2*len(re.findall(r'link\d+', last))))
-                            templ = self.navbar.generate(True, num, j, len(f), 
-                                             not self.has_single_feed, 
+                            templ = self.navbar.generate(True, num, j, len(f),
+                                             not self.has_single_feed,
                                              a.orig_url, __appname__, prefix=prefix,
                                              center=self.center_navbar)
                             elem = BeautifulSoup(templ.render(doctype='xhtml').decode('utf-8')).find('div')
                             body.insert(len(body.contents), elem)
                             with open(last, 'wb') as fi:
                                 fi.write(unicode(soup).encode('utf-8'))
-        
+
         if len(feeds) > 1:
             for i, f in enumerate(feeds):
                 entries.append('feed_%d/index.html'%i)
@@ -945,24 +945,24 @@ class BasicNewsRecipe(object):
         else:
             entries.append('feed_%d/index.html'%0)
             feed_index(0, toc)
-        
+
         for i, p in enumerate(entries):
             entries[i] = os.path.join(dir, p.replace('/', os.sep))
         opf.create_spine(entries)
         opf.set_toc(toc)
-        
+
         with nested(open(opf_path, 'wb'), open(ncx_path, 'wb')) as (opf_file, ncx_file):
             opf.render(opf_file, ncx_file)
-        
-    
+
+
     def article_downloaded(self, request, result):
         index = os.path.join(os.path.dirname(result[0]), 'index.html')
         if index != result[0]:
             if os.path.exists(index):
                 os.remove(index)
             os.rename(result[0], index)
-        a = request.requestID[1]        
-        
+        a = request.requestID[1]
+
         article = request.article
         self.log_debug(_('\nDownloaded article %s from %s\n%s')%(article.title, article.url, request.stream.getvalue().decode('utf-8', 'ignore')))
         article.orig_url = article.url
@@ -973,7 +973,7 @@ class BasicNewsRecipe(object):
         self.report_progress(float(self.jobs_done)/len(self.jobs), _('Article downloaded: %s')%article.title)
         if result[2]:
             self.partial_failures.append((request.feed.title, article.title, article.url, result[2]))
-        
+
     def error_in_article_download(self, request, traceback):
         self.jobs_done += 1
         self.log_error(_('Failed to download article: %s from %s\n')%(request.article.title, request.article.url))
@@ -983,10 +983,10 @@ class BasicNewsRecipe(object):
         self.log_debug('\n')
         self.report_progress(float(self.jobs_done)/len(self.jobs), _('Article download failed: %s')%request.article.title)
         self.failed_downloads.append((request.feed, request.article, debug))
-        
+
     def parse_feeds(self):
         '''
-        Create a list of articles from the list of feeds returned by :meth:`BasicNewsRecipe.get_feeds`. 
+        Create a list of articles from the list of feeds returned by :meth:`BasicNewsRecipe.get_feeds`.
         Return a list of :class:`Feed` objects.
         '''
         feeds = self.get_feeds()
@@ -999,7 +999,7 @@ class BasicNewsRecipe(object):
             self.report_progress(0, _('Fetching feed')+' %s...'%(title if title else url))
             try:
                 with closing(self.browser.open(url)) as f:
-                    parsed_feeds.append(feed_from_xml(f.read(), 
+                    parsed_feeds.append(feed_from_xml(f.read(),
                                           title=title,
                                           oldest_article=self.oldest_article,
                                           max_articles_per_feed=self.max_articles_per_feed,
@@ -1011,21 +1011,21 @@ class BasicNewsRecipe(object):
                 feed.description = unicode(err)
                 parsed_feeds.append(feed)
                 self.log_exception(msg)
-        
-        
+
+
         return parsed_feeds
-    
+
     @classmethod
     def tag_to_string(self, tag, use_alt=True):
         '''
-        Convenience method to take a 
+        Convenience method to take a
         `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_
-        `Tag` and extract the text from it recursively, including any CDATA sections 
+        `Tag` and extract the text from it recursively, including any CDATA sections
         and alt tag attributes. Return a possibly empty unicode string.
-        
-        `use_alt`: If `True` try to use the alt attribute for tags that don't 
+
+        `use_alt`: If `True` try to use the alt attribute for tags that don't
         have any textual content
-        
+
         `tag`: `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_
         `Tag`
         '''
@@ -1044,35 +1044,35 @@ class BasicNewsRecipe(object):
                 elif use_alt and item.has_key('alt'):
                     strings.append(item['alt'])
         return u''.join(strings)
-    
+
     @classmethod
     def soup(cls, raw):
-        entity_replace = [(re.compile(ur'&(\S+?);'), partial(entity_to_unicode, 
+        entity_replace = [(re.compile(ur'&(\S+?);'), partial(entity_to_unicode,
                                                            exceptions=[]))]
         nmassage = list(BeautifulSoup.MARKUP_MASSAGE)
         nmassage.extend(entity_replace)
         return BeautifulSoup(raw, markupMassage=nmassage)
-    
+
 class CustomIndexRecipe(BasicNewsRecipe):
-    
+
     def custom_index(self):
         '''
-        Return the filesystem path to a custom HTML document that will serve as the index for 
+        Return the filesystem path to a custom HTML document that will serve as the index for
         this recipe. The index document will typically contain many `<a href="...">`
         tags that point to resources on the internet that should be downloaded.
         '''
         raise NotImplementedError
-    
+
     def create_opf(self):
         mi = MetaInformation(self.title + strftime(self.timefmt), [__appname__])
         mi.publisher = __appname__
-        mi.author_sort = __appname__        
+        mi.author_sort = __appname__
         mi = OPFCreator(self.output_dir, mi)
         mi.create_manifest_from_files_in([self.output_dir])
         mi.create_spine([os.path.join(self.output_dir, 'index.html')])
         with open(os.path.join(self.output_dir, 'index.opf'), 'wb') as opf_file:
             mi.render(opf_file)
-    
+
     def download(self):
         index = os.path.abspath(self.custom_index())
         url = 'file:'+index if iswindows else 'file://'+index
@@ -1084,11 +1084,11 @@ class CustomIndexRecipe(BasicNewsRecipe):
         res = fetcher.start_fetch(url)
         self.create_opf()
         return res
-    
+
 class AutomaticNewsRecipe(BasicNewsRecipe):
-    
+
     keep_only_tags = [dict(name=['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'])]
-    
+
     def fetch_embedded_article(self, article, dir, logger, f, a, num_of_feeds):
         if self.use_embedded_content:
             self.web2disk_options.keep_only_tags = []
diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index 0d1b72b9ca..d407378ce5 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -36,7 +36,8 @@ recipe_modules = ['recipe_' + r for r in (
            'el_universal', 'mediapart', 'wikinews_en', 'ecogeek', 'daily_mail',
            'new_york_review_of_books_no_sub', 'politico', 'adventuregamers',
            'mondedurable', 'instapaper', 'dnevnik_cro', 'vecernji_list',
-           'nacional_cro', '24sata',
+           'nacional_cro', '24sata', 'dnevni_avaz', 'glas_srpske', '24sata_rs',
+           'krstarica', 'krstarica_en', 'tanjug',
           )]
 
 import re, imp, inspect, time, os
@@ -95,7 +96,7 @@ def compile_recipe(src):
     src = 'from %s.ebooks.lrf.web.profiles import DefaultProfile, FullContentProfile\n'%__appname__ + src
     src = '# coding: utf-8\n' + src
     src = 'from __future__ import with_statement\n' + src
-    
+
     src = src.replace('from libprs500', 'from calibre').encode('utf-8')
     f.write(src)
     f.close()
diff --git a/src/calibre/web/feeds/recipes/recipe_24sata_rs.py b/src/calibre/web/feeds/recipes/recipe_24sata_rs.py
new file mode 100644
index 0000000000..ac4ee2b860
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_24sata_rs.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+
+'''
+24sata.rs
+'''
+
+import re
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class Ser24Sata(BasicNewsRecipe):
+    title                 = '24 Sata - Sr'
+    __author__            = 'Darko Miletic'
+    description           = '24 sata portal vesti iz Srbije'
+    publisher             = 'Ringier d.o.o.'
+    category              = 'news, politics, entertainment, Serbia'
+    oldest_article        = 1
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    encoding              = 'utf-8'
+    use_embedded_content  = False
+    remove_javascript     = True
+    language              = _('Serbian')
+
+    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
+
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        , '--ignore-tables'
+                        ]
+
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True'
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    feeds = [(u'Vesti Dana', u'http://www.24sata.rs/rss.php')]
+
+    def preprocess_html(self, soup):
+        soup.html['xml:lang'] = 'sr-Latn-RS'
+        soup.html['lang']     = 'sr-Latn-RS'
+        mtag = '<meta http-equiv="Content-Language" content="sr-Latn-RS"/>\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
+        soup.head.insert(0,mtag)
+        return soup
+
+    def print_version(self, url):
+        article, sep, rest = url.partition('#')
+        return article.replace('/show.php','/_print.php')
+
diff --git a/src/calibre/web/feeds/recipes/recipe_b92.py b/src/calibre/web/feeds/recipes/recipe_b92.py
index 4926de82f5..6f466dfaa8 100644
--- a/src/calibre/web/feeds/recipes/recipe_b92.py
+++ b/src/calibre/web/feeds/recipes/recipe_b92.py
@@ -5,7 +5,6 @@ __copyright__ = '2008-2009, Darko Miletic <darko.miletic at gmail.com>'
 '''
 b92.net
 '''
-
 import re
 from calibre.web.feeds.news import BasicNewsRecipe
 
@@ -13,57 +12,53 @@ class B92(BasicNewsRecipe):
     title                 = 'B92'
     __author__            = 'Darko Miletic'
     description           = 'Dnevne vesti iz Srbije i sveta'    
-    oldest_article        = 2
-    publisher             = 'B92.net'
-    category              = 'news, politics, Serbia'    
+    publisher             = 'B92'
+    category              = 'news, politics, Serbia'
+    oldest_article        = 1
     max_articles_per_feed = 100
-    remove_javascript     = True
     no_stylesheets        = True
     use_embedded_content  = False
-    cover_url = 'http://static.b92.net/images/fp/logo.gif'
+    remove_javascript     = True
+    encoding              = 'cp1250'
     language              = _('Serbian')
-    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: sans1, sans-serif}'
+    extra_css             = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
     
     html2lrf_options = [
-                          '--comment'  , description
-                        , '--category' , category
+                          '--comment', description
+                        , '--category', category
                         , '--publisher', publisher
                         , '--ignore-tables'
                         ]
     
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True' 
-
-    keep_only_tags = [ dict(name='div', attrs={'class':'sama_vest'}) ]
-        
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em}"' 
+    
     preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    keep_only_tags     = [dict(name='table', attrs={'class':'maindocument'})]
+
+    remove_tags = [
+                     dict(name='ul', attrs={'class':'comment-nav'})
+                    ,dict(name=['embed','link','base']            )
+                  ]
 
     feeds          = [
                         (u'Vesti', u'http://www.b92.net/info/rss/vesti.xml')
                        ,(u'Biz'  , u'http://www.b92.net/info/rss/biz.xml'  )
-                       ,(u'Zivot', u'http://www.b92.net/info/rss/zivot.xml')
-                       ,(u'Sport', u'http://www.b92.net/info/rss/sport.xml')
                      ]
 
     def print_version(self, url):
-        main, sep, article_id = url.partition('nav_id=')
-        rmain, rsep, rrest = main.partition('.php?')
-        mrmain , rsepp, nnt = rmain.rpartition('/')
-        mprmain, rrsep, news_type = mrmain.rpartition('/')
-        nurl = 'http://www.b92.net/mobilni/' + news_type + '/index.php?nav_id=' + article_id
-        brbiz, biz, bizrest = rmain.partition('/biz/')
-        if biz:
-            nurl = 'http://www.b92.net/mobilni/biz/index.php?nav_id=' + article_id
-        return nurl
+        return url + '&version=print'
 
     def preprocess_html(self, soup):
-        lng = 'sr-Latn-RS'
-        soup.html['xml:lang'] = lng
-        soup.html['lang']     = lng
-        mtag = '<meta http-equiv="Content-Language" content="sr-Latn-RS"/>'
-        soup.head.insert(0,mtag)    
+        del soup.body['onload']
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>'
+        soup.head.insert(0,mtag)
         for item in soup.findAll(style=True):
             del item['style']
-        for item in soup.findAll(name='img',align=True):
+        for item in soup.findAll(align=True):
             del item['align']
-            item.insert(0,'<br /><br />')
+        for item in soup.findAll('font'):
+            item.name='p'
+            if item.has_key('size'):
+               del item['size']
         return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py b/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py
new file mode 100644
index 0000000000..5a55db9404
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_dnevni_avaz.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+
+'''
+dnevniavaz.ba
+'''
+
+import re
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class DnevniAvaz(BasicNewsRecipe):
+    title                 = 'Dnevni Avaz'
+    __author__            = 'Darko Miletic'
+    description           = 'Latest news from Bosnia'
+    publisher             = 'Dnevni Avaz'
+    category              = 'news, politics, Bosnia and Herzegovina'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    encoding              = 'utf-8'
+    use_embedded_content  = False
+    remove_javascript     = True
+    cover_url             = 'http://www.dnevniavaz.ba/img/logo.gif'
+    lang                  = 'bs-BA'
+    language              = _('Bosnian')
+
+    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
+
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"'
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    keep_only_tags = [dict(name='div', attrs={'id':['fullarticle-title','fullarticle-leading','fullarticle-date','fullarticle-text','articleauthor']})]
+
+    remove_tags = [dict(name=['object','link','base'])]
+
+    feeds = [
+               (u'Najnovije'     , u'http://www.dnevniavaz.ba/rss/novo'     )
+              ,(u'Najpopularnije', u'http://www.dnevniavaz.ba/rss/popularno')
+            ]
+
+    def preprocess_html(self, soup):
+        soup.html['xml:lang'] = self.lang
+        soup.html['lang']     = self.lang
+        mtag = '<meta http-equiv="Content-Language" content="bs-BA"/>\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
+        soup.head.insert(0,mtag)
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_faznet.py b/src/calibre/web/feeds/recipes/recipe_faznet.py
index ceeeba6cd1..a47bf8ced5 100644
--- a/src/calibre/web/feeds/recipes/recipe_faznet.py
+++ b/src/calibre/web/feeds/recipes/recipe_faznet.py
@@ -1,29 +1,50 @@
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-'''
-Profile to download FAZ.net
-'''
-import re
-from calibre.web.feeds.news import BasicNewsRecipe
- 
-
-class FazNet(BasicNewsRecipe): 
-
-    title = 'FAZ NET'
-    __author__ = 'Kovid Goyal'
-    description = 'Frankfurter Allgemeine Zeitung'
-    use_embedded_content   = False
-    language = _('German') 
-    max_articles_per_feed = 30 
-
-    preprocess_regexps = [
-       (re.compile(r'Zum Thema</span>.*?</BODY>', re.IGNORECASE | re.DOTALL), 
-        lambda match : ''),
-    ]    
-
-
-    feeds = [ ('FAZ.NET', 'http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml') ] 
-
-    def print_version(self, url): 
-        return url.replace('.html?rss_aktuell', '~Afor~Eprint.html') 
-
+__license__   = 'GPL v3'
+__copyright__ = '2008-2009, Kovid Goyal <kovid at kovidgoyal.net>, Darko Miletic <darko at gmail.com>'
+'''
+Profile to download FAZ.net
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+ 
+class FazNet(BasicNewsRecipe): 
+    title                 = 'FAZ NET'
+    __author__            = 'Kovid Goyal, Darko Miletic'
+    description           = 'Frankfurter Allgemeine Zeitung'
+    publisher             = 'FAZ Electronic Media GmbH'
+    category              = 'news, politics, Germany'
+    use_embedded_content  = False
+    language              = _('German') 
+    max_articles_per_feed = 30 
+    no_stylesheets        = True
+    encoding              = 'utf-8'
+    remove_javascript     = True
+
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' 
+    
+    keep_only_tags = [dict(name='div', attrs={'class':'Article'})]
+
+    remove_tags = [
+                     dict(name=['object','link','embed','base'])
+                    ,dict(name='div', attrs={'class':['LinkBoxModulSmall','ModulVerlagsInfo']})
+                  ]
+    
+
+    feeds = [ ('FAZ.NET', 'http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml') ] 
+
+    def print_version(self, url):
+        article, sep, rest = url.partition('?')    
+        return article.replace('.html', '~Afor~Eprint.html') 
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>'
+        soup.head.insert(0,mtag)        
+        del soup.body['onload']
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_glas_srpske.py b/src/calibre/web/feeds/recipes/recipe_glas_srpske.py
new file mode 100644
index 0000000000..c6329387ce
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_glas_srpske.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+
+'''
+glassrpske.com
+'''
+
+import re
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class GlasSrpske(BasicNewsRecipe):
+    title                 = 'Glas Srpske'
+    __author__            = 'Darko Miletic'
+    description           = 'Latest news from republika srpska'
+    publisher             = 'GLAS SRPSKE'
+    category              = 'Novine, Dnevne novine, Vijesti, Novosti, Ekonomija, Sport, Crna Hronika, Banja Luka,, Republika Srpska, Bosna i Hercegovina'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    encoding              = 'utf-8'
+    use_embedded_content  = False
+    remove_javascript     = True    
+    cover_url             = 'http://www.glassrpske.com/var/slike/glassrpske-logo.png'
+    lang                  = 'sr-BA'
+    language              = _('Serbian')
+    INDEX                 = 'http://www.glassrpske.com'
+
+    extra_css = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"' 
+     
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    keep_only_tags = [dict(name='div', attrs={'class':'gl_cv paragraf'})]
+
+    remove_tags = [dict(name=['object','link','base'])]
+    
+    feeds = [ 
+               (u'Novosti'   , u'http://www.glassrpske.com/vijest/2/novosti/lat/'   )
+              ,(u'Drustvo'   , u'http://www.glassrpske.com/vijest/3/drustvo/lat/'   )
+              ,(u'Biznis'    , u'http://www.glassrpske.com/vijest/4/ekonomija/lat/' )
+              ,(u'Kroz RS'   , u'http://www.glassrpske.com/vijest/5/krozrs/lat/'    )
+              ,(u'Hronika'   , u'http://www.glassrpske.com/vijest/6/hronika/lat/'   )
+              ,(u'Srbija'    , u'http://www.glassrpske.com/vijest/8/srbija/lat/'    )
+              ,(u'Region'    , u'http://www.glassrpske.com/vijest/18/region/lat/'   )
+              ,(u'Svijet'    , u'http://www.glassrpske.com/vijest/12/svijet/lat/'   )
+              ,(u'Kultura'   , u'http://www.glassrpske.com/vijest/9/kultura/lat/'   )
+              ,(u'Banja Luka', u'http://www.glassrpske.com/vijest/10/banjaluka/lat/')
+              ,(u'Jet Set'   , u'http://www.glassrpske.com/vijest/11/jetset/lat/'   )
+              ,(u'Muzika'    , u'http://www.glassrpske.com/vijest/19/muzika/lat/'   )
+              ,(u'Sport'     , u'http://www.glassrpske.com/vijest/13/sport/lat/'    )
+              ,(u'Kolumne'   , u'http://www.glassrpske.com/vijest/16/kolumne/lat/'  )
+              ,(u'Plus'      , u'http://www.glassrpske.com/vijest/7/plus/lat/'      )              
+            ]
+
+    def preprocess_html(self, soup):
+        soup.html['xml:lang'] = self.lang
+        soup.html['lang']     = self.lang
+        mtag = '<meta http-equiv="Content-Language" content="sr-BA"/>\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
+        soup.head.insert(0,mtag)
+        return soup        
+        
+    def parse_index(self):
+        totalfeeds = []
+        lfeeds = self.get_feeds()
+        for feedobj in lfeeds:
+            feedtitle, feedurl = feedobj
+            self.report_progress(0, _('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl))
+            articles = []
+            soup = self.index_to_soup(feedurl)
+            for item in soup.findAll('div', attrs={'class':'gl_rub'}):
+                atag    = item.find('a')
+                ptag    = item.find('p')
+                datetag = item.find('span')
+                url           = self.INDEX + atag['href']
+                title         = self.tag_to_string(atag)
+                description   = self.tag_to_string(ptag)
+                date,sep,rest = self.tag_to_string(ptag).partition('|')
+                articles.append({
+                                      'title'      :title
+                                     ,'date'       :date
+                                     ,'url'        :url
+                                     ,'description':description
+                                    })
+            totalfeeds.append((feedtitle, articles))
+        return totalfeeds
+        
+        
\ No newline at end of file
diff --git a/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py b/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py
index 4f2f018708..b76018d87a 100644
--- a/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py
+++ b/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py
@@ -8,19 +8,20 @@ joelonsoftware.com
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Joelonsoftware(BasicNewsRecipe):
-    
+
     title       = 'Joel on Software'
     __author__  = 'Darko Miletic'
     description = 'Painless Software Management'
     language = _('English')
     no_stylesheets = True
     use_embedded_content  = True
-    
+    oldest_article = 60
+
     cover_url = 'http://www.joelonsoftware.com/RssJoelOnSoftware.jpg'
-    
+
     html2lrf_options = [  '--comment'       , description
                         , '--category'      , 'blog,software,news'
                         , '--author'        , 'Joel Spolsky'
                        ]
-    
+
     feeds = [(u'Articles', u'http://www.joelonsoftware.com/rss.xml')]
diff --git a/src/calibre/web/feeds/recipes/recipe_krstarica.py b/src/calibre/web/feeds/recipes/recipe_krstarica.py
new file mode 100644
index 0000000000..fb25ae8d84
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_krstarica.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+vesti.krstarica.com
+'''
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Krstarica(BasicNewsRecipe):
+    title                 = 'Krstarica - Vesti'
+    __author__            = 'Darko Miletic'
+    description           = 'Dnevne vesti iz Srbije i sveta'    
+    publisher             = 'Krstarica'
+    category              = 'news, politics, Serbia'
+    oldest_article        = 1
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_javascript     = True
+    encoding              = 'utf-8'
+    language              = _('Serbian')
+    extra_css             = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em}"' 
+    
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    feeds          = [
+                        (u'Vesti dana'         , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=aktuelno&lang=0'     )
+                       ,(u'Srbija'             , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=scg&lang=0'          )
+                       ,(u'Svet'               , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=svet&lang=0'         )
+                       ,(u'Politika'           , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=politika&lang=0'     )
+                       ,(u'Ekonomija'          , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=ekonomija&lang=0'    )
+                       ,(u'Drustvo'            , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=drustvo&lang=0'      )
+                       ,(u'Kultura'            , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=kultura&lang=0'      )
+                       ,(u'Nauka i Tehnologija', u'http://vesti.krstarica.com/index.php?rss=1&rubrika=nauka&lang=0'        )
+                       ,(u'Medicina'           , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=medicina&lang=0'     )
+                       ,(u'Sport'              , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=sport&lang=0'        )
+                       ,(u'Zanimljivosti'      , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=zanimljivosti&lang=0')
+                     ]
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>'
+        soup.head.insert(0,mtag)
+        titletag = soup.find('h4')
+        if titletag:
+           realtag = titletag.parent.parent
+           realtag.extract()
+           for item in soup.findAll(['table','center']):
+               item.extract()
+           soup.body.insert(1,realtag)            
+           realtag.name = 'div'
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll(align=True):
+            del item['align']
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_krstarica_en.py b/src/calibre/web/feeds/recipes/recipe_krstarica_en.py
new file mode 100644
index 0000000000..e426e7d807
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_krstarica_en.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+vesti.krstarica.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Krstarica_en(BasicNewsRecipe):
+    title                 = 'Krstarica - news in english'
+    __author__            = 'Darko Miletic'
+    description           = 'News from Serbia and world'    
+    publisher             = 'Krstarica'
+    category              = 'news, politics, Serbia'
+    oldest_article        = 1
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_javascript     = True
+    encoding              = 'utf-8'
+    language              = _('English')
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em}"' 
+        
+    feeds          = [
+                        (u'Daily news', u'http://vesti.krstarica.com/index.php?rss=1&rubrika=aktuelno&lang=1'     )
+                       ,(u'Serbia'    , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=scg&lang=1'          )
+                       ,(u'Politics'  , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=politika&lang=1'     )
+                       ,(u'Economy'   , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=ekonomija&lang=1'    )
+                       ,(u'Culture'   , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=kultura&lang=1'      )
+                       ,(u'Sports'    , u'http://vesti.krstarica.com/index.php?rss=1&rubrika=sport&lang=1'        )
+                     ]
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>'
+        soup.head.insert(0,mtag)
+        titletag = soup.find('h4')
+        if titletag:
+           realtag = titletag.parent.parent
+           realtag.extract()
+           for item in soup.findAll(['table','center']):
+               item.extract()
+           soup.body.insert(1,realtag)            
+           realtag.name = 'div'
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll(align=True):
+            del item['align']
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_spiegelde.py b/src/calibre/web/feeds/recipes/recipe_spiegelde.py
index c45db73972..0b1503f944 100644
--- a/src/calibre/web/feeds/recipes/recipe_spiegelde.py
+++ b/src/calibre/web/feeds/recipes/recipe_spiegelde.py
@@ -8,11 +8,11 @@ Fetch Spiegel Online.
 import re
 
 from calibre.web.feeds.news import BasicNewsRecipe
-
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
 
 class SpeigelOnline(BasicNewsRecipe):
-    
-    title = 'Spiegel Online' 
+
+    title = 'Spiegel Online'
     description = 'Nachrichten des Magazins Der Spiegel'
     __author__ = 'Kovid Goyal'
     use_embedded_content   = False
@@ -22,17 +22,26 @@ class SpeigelOnline(BasicNewsRecipe):
     no_stylesheets = True
 
     preprocess_regexps = \
-        [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in 
+        [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
             [
              # Remove Zum Thema footer
              (r'<div class="spArticleCredit.*?</body>', lambda match: '</body>'),
              ]
             ]
-    
-    feeds= [ ('Spiegel Online', 'http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml') ] 
 
-       
+    feeds= [ ('Spiegel Online', 'http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml') ]
+
+
     def print_version(self,url):
         tokens = url.split(',')
         tokens[-2:-2] = ['druck|']
         return ','.join(tokens).replace('|,','-')
+
+    def postprocess_html(self, soup, first_fetch):
+        if soup.contents[0].name == 'head':
+            x = BeautifulSoup('<html></html>')
+            for y in reversed(soup.contents):
+                x.contents[0].insert(0, y)
+            soup = x
+
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_tanjug.py b/src/calibre/web/feeds/recipes/recipe_tanjug.py
new file mode 100644
index 0000000000..9a8acfaca7
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_tanjug.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+tanjug.rs
+'''
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Tanjug(BasicNewsRecipe):
+    title                 = 'Tanjug'
+    __author__            = 'Darko Miletic'
+    description           = 'Novinska agencija TANJUG - Dnevne vesti iz Srbije i sveta'
+    publisher             = 'Tanjug'
+    category              = 'news, politics, Serbia'
+    oldest_article        = 1
+    max_articles_per_feed = 100
+    use_embedded_content  = True
+    encoding              = 'utf-8'
+    lang                  = 'sr-Latn-RS'
+    language              = _('Serbian')
+    extra_css             = '@font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} body{font-family: serif1, serif} .article_description{font-family: serif1, serif}'
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
+    
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em}"' 
+    
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    feeds          = [(u'Vesti', u'http://www.tanjug.rs/StaticPages/RssTanjug.aspx')]
+
+    def preprocess_html(self, soup):
+        soup.html['xml:lang'] = self.lang
+        soup.html['lang'    ] = self.lang
+        soup.html['dir'     ] = "ltr"
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>'
+        soup.head.insert(0,mtag)
+        return soup
diff --git a/src/calibre/www/__init__.py b/src/calibre/www/__init__.py
new file mode 100644
index 0000000000..3d1a86922e
--- /dev/null
+++ b/src/calibre/www/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
+
diff --git a/src/calibre/www/apps/__init__.py b/src/calibre/www/apps/__init__.py
new file mode 100644
index 0000000000..3d1a86922e
--- /dev/null
+++ b/src/calibre/www/apps/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
+
diff --git a/src/calibre/www/apps/blog/CHANGELOG.yml b/src/calibre/www/apps/blog/CHANGELOG.yml
new file mode 100644
index 0000000000..01106f1ad6
--- /dev/null
+++ b/src/calibre/www/apps/blog/CHANGELOG.yml
@@ -0,0 +1,85 @@
+changes:
+    date: 2008-09-17
+        change: Enabled the ability to override the default template names.
+
+    date: 2008-08-26
+        change: Upgraded post_detail.html to now use new Django refactored comments. Sidenote: basic.remarks have been removed.
+        
+    date: 2008-07-14
+        change: Removed get_query_set from Blog manager to fix a problem where saving a post marked as Draft would not save.
+        change: Added a get_previous_post and get_next_post method for front end template. These will not return Draft posts.
+        
+    date: 2008-06-17
+        change: BlogPostFeed is now BlogPostsFeed and there is a new BlogPostsByCategory.
+        
+    date: 2008-05-18
+        change: Converted everything to 4 space tabs and made a few other changes to comply with Python Style Guide.
+
+    date: 2008-04-23
+        change: Added an inline admin interface helper for choosing inlines to go into posts.
+        change: The inline app is now a dependancy of the blog. 
+
+    date: 2008-04-22
+        change: Removed the 'render_inlines' filter from the Blog template tags. The tag is now in an app called inlines which can be used with any django app.
+
+    date: 2008-02-27
+        change: Added 'allow_comments' field to the Post model.
+        change: Removed 'Closed' choice from status field of Post model
+
+    date: 2008-02-18
+        fix: Fixed feed pointing to hardcoded url.
+
+    date: 2008-02-15
+        change: Internationalized models
+
+    date: 2008-02-04
+        change: Added 'get_links' template filter.
+        change: Templates: added a {% block content_title %}
+
+    date: 2008-02-02
+        change: Added a sitemap
+
+    date: 2008-01-30
+        change: Renamed 'do_inlines' filter to 'render_inlines'
+
+    date: 2008-01-29
+        change: BeautifulSoup is no longer a dependancy unless you want to use the do_inlines filter.
+
+    date: 2008-01-27
+        fix: removed 'tagging.register(Post)' from model. It was causing too many unnecessary SQL JOINS.
+        change: Changed the inlines tag to a filter. (Example: {{ object.text|do_inlines }})
+
+    date: 2008-01-22
+        change: Registered the Post model with the tagging app
+
+    date: 2008-01-19
+        change: Renamed the 'list' class to 'link_list'
+
+    date: 2008-01-09
+        change: Changed urls.py so you can have /posts/page/2/ or /posts/?page=2
+
+    date: 2008-01-07
+        change: Removed PublicPostManager in favor of ManagerWithPublished. 
+        change: Made wrappers for generic views.
+
+    date: 2008-01-06
+        fix: In blog.py changed 'beautifulsoup' to 'BeautifulSoup'
+
+    date: 2007-12-31
+        change: Changed some syntax in managers.py to hopefully fix a bug.
+        change: Removed an inline template that didn't belong.
+
+    date: 2007-12-21
+        change: Added markup tag that formats inlines.
+
+    date: 2007-12-12
+        change: Cleaned up unit tests.
+
+    date: 2007-12-11
+        change: Add documentation to templatetags and views.
+        change: Smartened up the previous/next blog part of the post_detail.html template.
+
+    date: 2007-12-09
+        change: Added feed templates and wrapped up feeds.py.
+        change: Changed Post.live manager to Post.public
+        change: Added a search view along with templates
diff --git a/src/calibre/www/apps/blog/README.txt b/src/calibre/www/apps/blog/README.txt
new file mode 100644
index 0000000000..588bef40a1
--- /dev/null
+++ b/src/calibre/www/apps/blog/README.txt
@@ -0,0 +1,18 @@
+===========================================
+Django Basic Blog
+http://code.google.com/p/django-basic-apps/
+===========================================
+
+A simple blog application for Django projects.
+
+To install this app, simply create a folder somewhere in
+your PYTHONPATH named 'basic' and place the 'blog'
+app inside. Then add 'basic.blog' to your projects
+INSTALLED_APPS list in your settings.py file.
+
+=== Dependancies ===
+ * Basic Inlines
+ * [http://www.djangoproject.com/documentation/add_ons/#comments Django Comments]
+ * [http://code.google.com/p/django-tagging Django Tagging]
+ * [http://www.djangoproject.com/documentation/add_ons/#markup Markup]
+ * [http://www.crummy.com/software/BeautifulSoup/ BeautifulSoup] - only if you want to use the [http://code.google.com/p/django-basic-blog/wiki/BlogInlinesProposal render_inlines] filter, otherwise it's not necessary.
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/__init__.py b/src/calibre/www/apps/blog/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/www/apps/blog/admin.py b/src/calibre/www/apps/blog/admin.py
new file mode 100644
index 0000000000..089e2508e1
--- /dev/null
+++ b/src/calibre/www/apps/blog/admin.py
@@ -0,0 +1,17 @@
+from django.contrib import admin
+from calibre.www.apps.blog.models import *
+
+
+class CategoryAdmin(admin.ModelAdmin):
+    prepopulated_fields = {'slug': ('title',)}
+
+admin.site.register(Category, CategoryAdmin)
+
+
+class PostAdmin(admin.ModelAdmin):
+    list_display  = ('title', 'publish', 'status')
+    list_filter   = ('publish', 'categories', 'status')
+    search_fields = ('title', 'body')
+    prepopulated_fields = {'slug': ('title',)}
+
+admin.site.register(Post, PostAdmin)
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/feeds.py b/src/calibre/www/apps/blog/feeds.py
new file mode 100644
index 0000000000..95573ec9a7
--- /dev/null
+++ b/src/calibre/www/apps/blog/feeds.py
@@ -0,0 +1,42 @@
+from django.contrib.syndication.feeds import FeedDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.sites.models import Site
+from django.contrib.syndication.feeds import Feed
+from django.core.urlresolvers import reverse
+from calibre.www.apps.blog.models import Post, Category
+
+
+class BlogPostsFeed(Feed):
+    _site = Site.objects.get_current()
+    title = '%s feed' % _site.name
+    description = '%s posts feed.' % _site.name
+
+    def link(self):
+        return reverse('blog_index')
+
+    def items(self):
+        return Post.objects.published()[:10]
+
+    def item_pubdate(self, obj):
+        return obj.publish
+
+
+class BlogPostsByCategory(Feed):
+    _site = Site.objects.get_current()
+    title = '%s posts category feed' % _site.name
+    
+    def get_object(self, bits):
+        if len(bits) != 1:
+            raise ObjectDoesNotExist
+        return Category.objects.get(slug__exact=bits[0])
+
+    def link(self, obj):
+        if not obj:
+            raise FeedDoesNotExist
+        return obj.get_absolute_url()
+
+    def description(self, obj):
+        return "Posts recently categorized as %s" % obj.title
+    
+    def items(self, obj):
+        return obj.post_set.published()[:10]
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/managers.py b/src/calibre/www/apps/blog/managers.py
new file mode 100644
index 0000000000..d5bcdb005c
--- /dev/null
+++ b/src/calibre/www/apps/blog/managers.py
@@ -0,0 +1,9 @@
+from django.db.models import Manager
+import datetime
+
+
+class PublicManager(Manager):
+    """Returns published posts that are not in the future."""
+    
+    def published(self):
+        return self.get_query_set().filter(status__gte=2, publish__lte=datetime.datetime.now())
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/models.py b/src/calibre/www/apps/blog/models.py
new file mode 100644
index 0000000000..b719d8cb8a
--- /dev/null
+++ b/src/calibre/www/apps/blog/models.py
@@ -0,0 +1,80 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.db.models import permalink
+from django.contrib.auth.models import User
+from calibre.www.apps.tagging.fields import TagField
+from calibre.www.apps.blog.managers import PublicManager
+
+import calibre.www.apps.tagging as tagging
+
+class Category(models.Model):
+    """Category model."""
+    title       = models.CharField(_('title'), max_length=100)
+    slug        = models.SlugField(_('slug'), unique=True)
+
+    class Meta:
+        verbose_name = _('category')
+        verbose_name_plural = _('categories')
+        db_table = 'blog_categories'
+        ordering = ('title',)
+
+    class Admin:
+        pass
+
+    def __unicode__(self):
+        return u'%s' % self.title
+
+    @permalink
+    def get_absolute_url(self):
+        return ('blog_category_detail', None, {'slug': self.slug})
+
+
+class Post(models.Model):
+    """Post model."""
+    STATUS_CHOICES = (
+        (1, _('Draft')),
+        (2, _('Public')),
+    )
+    title           = models.CharField(_('title'), max_length=200)
+    slug            = models.SlugField(_('slug'), unique_for_date='publish')
+    author          = models.ForeignKey(User, blank=True, null=True)
+    body            = models.TextField(_('body'))
+    tease           = models.TextField(_('tease'), blank=True)
+    status          = models.IntegerField(_('status'), choices=STATUS_CHOICES, default=2)
+    allow_comments  = models.BooleanField(_('allow comments'), default=True)
+    publish         = models.DateTimeField(_('publish'))
+    created         = models.DateTimeField(_('created'), auto_now_add=True)
+    modified        = models.DateTimeField(_('modified'), auto_now=True)
+    categories      = models.ManyToManyField(Category, blank=True)
+    tags            = TagField()
+    objects         = PublicManager()
+
+    class Meta:
+        verbose_name = _('post')
+        verbose_name_plural = _('posts')
+        db_table  = 'blog_posts'
+        ordering  = ('-publish',)
+        get_latest_by = 'publish'
+
+    class Admin:
+        list_display  = ('title', 'publish', 'status')
+        list_filter   = ('publish', 'categories', 'status')
+        search_fields = ('title', 'body')
+
+    def __unicode__(self):
+        return u'%s' % self.title
+
+    @permalink
+    def get_absolute_url(self):
+        return ('blog_detail', None, {
+            'year': self.publish.year,
+            'month': self.publish.strftime('%b').lower(),
+            'day': self.publish.day,
+            'slug': self.slug
+        })
+
+    def get_previous_post(self):
+        return self.get_previous_by_publish(status__gte=2)
+
+    def get_next_post(self):
+        return self.get_next_by_publish(status__gte=2)
diff --git a/src/calibre/www/apps/blog/sitemap.py b/src/calibre/www/apps/blog/sitemap.py
new file mode 100644
index 0000000000..d78c71022e
--- /dev/null
+++ b/src/calibre/www/apps/blog/sitemap.py
@@ -0,0 +1,13 @@
+from django.contrib.sitemaps import Sitemap
+from calibre.www.apps.blog.models import Post
+
+
+class BlogSitemap(Sitemap):
+    changefreq = "never"
+    priority = 0.5
+
+    def items(self):
+        return Post.objects.published()
+
+        def lastmod(self, obj):
+            return obj.publish
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/admin/blog/post/change_form.html b/src/calibre/www/apps/blog/templates/admin/blog/post/change_form.html
new file mode 100644
index 0000000000..08c034b77c
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/admin/blog/post/change_form.html
@@ -0,0 +1,56 @@
+{% extends "admin/change_form.html" %}
+
+{% block extrahead %}
+  {% load adminmedia inlines %}
+  {{ block.super }}
+  <script type="text/javascript">
+    function InlineInit() {
+      var body_div = document.getElementById('id_body').parentNode;
+      var content = ''
+      content += '{% get_inline_types as inline_list %}'
+      content += '<label>Body inlines:</label>'
+      
+      content += '<strong>Inline type:</strong> '
+      content += '<select id="id_inline_content_type" onchange="document.getElementById(\'lookup_id_inline\').href = \'../../../\'+this.value+\'/\';" style="margin-right:20px;">'
+      content += '  <option>----------</option>'
+      content += '  {% for inline in inline_list %}'
+      content += '  <option value="{{ inline.content_type.app_label }}/{{ inline.content_type.model }}">{{ inline.content_type.app_label|capfirst }}: {{ inline.content_type.model|capfirst }}</option>'
+      content += '  {% endfor %}'
+      content += '</select> '
+      
+      content += '<strong>Object:</strong> '
+      content += '<input type="text" class="vIntegerField" id="id_inline" size="10" /> '
+      content += '<a id="lookup_id_inline" href="#" class="related-lookup" onclick="if(document.getElementById(\'id_inline_content_type\').value != \'----------\') { return showRelatedObjectLookupPopup(this); }" style="margin-right:20px;"><img src="{% admin_media_prefix %}img/admin/selector-search.gif" width="16" height="16" alt="Loopup" /></a> '
+      
+      content += '<strong>Class:</strong> '
+      content += '<select id="id_inline_class">'
+      content += '  <option value="small_left">Small left</option>'
+      content += '  <option value="small_right">Small right</option>'
+      content += '  <option value="medium_left">Medium left</option>'
+      content += '  <option value="medium_right">Medium right</option>'
+      content += '  <option value="large_left">Large left</option>'
+      content += '  <option value="large_right">Large right</option>'
+      content += '  <option value="full">Full</option>'
+      content += '</select>'
+      
+      content += '<input type="button" value="Add" style="margin-left:10px;" onclick="return insertInline(document.getElementById(\'id_inline_content_type\').value, document.getElementById(\'id_inline\').value, document.getElementById(\'id_inline_class\').value)" />'
+      content += '<p class="help">Insert inlines into your body by choosing an inline type, then an object, then a class.</p>'
+      
+      var div = document.createElement('div');
+      div.setAttribute('style', 'margin-top:10px;');
+      div.innerHTML = content;
+      
+      body_div.insertBefore(div);
+    }
+    
+    function insertInline(type, id, classname) {
+      if (type != '----------' && id != '') {
+        inline = '<inline type="'+type.replace('/', '.')+'" id="'+id+'" class="'+classname+'" />';
+        body = document.getElementById('id_body');
+        body.value = body.value + inline + '\n';
+      }
+    }
+    
+    addEvent(window, 'load', InlineInit);
+  </script>
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/base.html b/src/calibre/www/apps/blog/templates/base.html
new file mode 100644
index 0000000000..880d8a996f
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/base.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+   "http://www.w3.org/TR/html4/strict.dtd">
+
+<html lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>{% block title %}{% endblock %}</title>
+</head>
+<body id="{% block body_id %}{% endblock %}">
+  <div id="body">
+    {% block body %}
+      <div>
+        {% block content_title %}{% endblock %}
+      </div>
+      <div class="content">
+        {% block content %}{% endblock %}
+      </div>
+    {% endblock %}
+  </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/base_blog.html b/src/calibre/www/apps/blog/templates/blog/base_blog.html
new file mode 100644
index 0000000000..b05c03e8b1
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/base_blog.html
@@ -0,0 +1,4 @@
+{% extends "base.html" %}
+
+
+{% block body_class %}blog{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/category_detail.html b/src/calibre/www/apps/blog/templates/blog/category_detail.html
new file mode 100644
index 0000000000..23a2579766
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/category_detail.html
@@ -0,0 +1,25 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}Posts for {{ category.title }}{% endblock %}
+{% block body_class %}{{ block.super }} category_detail{% endblock %}
+{% block body_id %}category_{{ category.id }}{% endblock %}
+
+
+{% block content_title %}
+  <h2>Posts for {{ category.title }}</h2>
+{% endblock %}
+
+
+{% block content %}
+  {% load markup %}
+  <div class="post_list">
+    {% for post in object_list %}
+    <div>
+      <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
+      <p class="date">{{ post.publish|date:"Y F d" }}</p>
+      <p class="tease">{{ post.tease }}</p>
+    </div>
+    {% endfor %}
+  </div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/category_list.html b/src/calibre/www/apps/blog/templates/blog/category_list.html
new file mode 100644
index 0000000000..6ec01e46bc
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/category_list.html
@@ -0,0 +1,20 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}Post categories{% endblock %}
+{% block body_class %}{{ block.super }} category_list{% endblock %}
+
+
+{% block content_title %}
+  <h2>Post categories</h2>
+{% endblock %}
+
+
+{% block content %}
+  {% load markup %}
+  <ul class="link_list">
+    {% for category in object_list %}
+    <li><a href="{{ category.get_absolute_url }}">{{ category }}</a></li>
+    {% endfor %}
+  </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/post_archive_day.html b/src/calibre/www/apps/blog/templates/blog/post_archive_day.html
new file mode 100644
index 0000000000..b9d9ab97fb
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/post_archive_day.html
@@ -0,0 +1,23 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}Post archive for {{ day|date:"d F Y" }}{% endblock %}
+{% block body_class %}{{ block.super }} post_archive_day{% endblock %}
+
+
+{% block content_title %}
+  <h2>Post archive for {{ day|date:"d F Y" }}</h2>
+{% endblock %}
+
+
+{% block content %}
+  <div class="post_list">
+    {% for post in object_list %}
+    <div>
+      <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
+      <p class="date">{{ post.publish|date:"Y F d" }}</p>
+      <p class="tease">{{ post.tease }}</p>
+    </div>
+    {% endfor %}
+  </div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/post_archive_month.html b/src/calibre/www/apps/blog/templates/blog/post_archive_month.html
new file mode 100644
index 0000000000..947a1cc7d0
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/post_archive_month.html
@@ -0,0 +1,23 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}Post archive for {{ month|date:"F Y" }}{% endblock %}
+{% block body_class %}{{ block.super }} post_archive_month{% endblock %}
+
+
+{% block content_title %}
+  <h2>Post archive for {{ month|date:"F Y" }}</h2>
+{% endblock %}
+
+
+{% block content %}
+  <div class="post_list">
+    {% for post in object_list %}
+    <div>
+      <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
+      <p class="date">{{ post.publish|date:"Y F d" }}</p>
+      <p class="tease">{{ post.tease }}</p>
+    </div>
+    {% endfor %}
+  </div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/post_archive_year.html b/src/calibre/www/apps/blog/templates/blog/post_archive_year.html
new file mode 100644
index 0000000000..f0255220b2
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/post_archive_year.html
@@ -0,0 +1,21 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}Post archive for {{ year }}{% endblock %}
+{% block body_class %}{{ block.super }} post_archive_year{% endblock %}
+
+
+{% block content_title %}
+  <h2>Post archive for {{ year }}</h2>
+{% endblock %}
+
+
+{% block content %}
+  {% load markup %}
+  
+  <ul class="link_list">
+    {% for month in date_list %}
+    <li><a href="{% url blog_index %}{{ year }}/{{ month|date:"b" }}/">{{ month|date:"F" }}</a></li>
+    {% endfor %}
+  </ul>
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/post_detail.html b/src/calibre/www/apps/blog/templates/blog/post_detail.html
new file mode 100644
index 0000000000..a4247dcc4f
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/post_detail.html
@@ -0,0 +1,67 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}{{ object.title }}{% endblock %}
+{% block body_class %}{{ block.super }} post_detail{% endblock %}
+{% block body_id %}post_{{ object.id }}{% endblock %}
+
+
+{% block content_title %}
+  <h2>{{ object.title }}</h2>
+  <p class="other_posts">
+    {% if object.get_previous_by_publish %}
+    <a class="previous" href="{{ object.get_previous_post.get_absolute_url }}">&laquo; {{ object.get_previous_post }}</a>
+    {% endif %}
+    {% if object.get_next_by_publish %}
+    | <a class="next" href="{{ object.get_next_post.get_absolute_url }}">{{ object.get_next_post }} &raquo;</a> 
+    {% endif %}
+  </p>
+{% endblock %}
+
+
+{% block content %}
+  {% load blog markup comments tagging_tags %}
+  
+  <p class="date">{{ object.publish|date:"j F Y" }}</p>
+  
+  <div class="body">
+    {{ object.body|markdown:"safe" }}
+  </div>
+  
+  {% tags_for_object object as tag_list %}
+  {% if tag_list %}
+  <p class="inline_tag_list"><strong>Related tags:</strong>
+    {% for tag in tag_list %}
+    {{ tag }}{% if not forloop.last %}, {% endif %}
+    {% endfor %}
+  </p>
+  {% endif %}
+  
+  {% get_comment_list for object as comment_list %}
+  {% if comment_list %}
+  <div id="comments">
+    <a name="comments"></a>
+    <h3 class="comments_title">Comments</h3>
+    {% for comment in comment_list %}
+      {% if comment.is_public %}
+      <div class="comment">
+        <h5 class="name">
+          <a name="c{{ comment.id }}" href="{{ comment.get_absolute_url }}" title="Permalink to {{ comment.person_name }}'s comment" class="count">{{ forloop.counter }}</a> 
+          {% if comment.user_url %}<a href="{{ comment.user_url }}">{{ comment.user_name }}</a>{% else %}{{ comment.user_name }}{% endif %} says...
+        </h5>
+        {{ comment.comment|urlizetrunc:"60"|markdown:"safe" }}
+        <p class="date">Posted at {{ comment.submit_date|date:"P" }} on {{ comment.submit_date|date:"F j, Y" }}</p>
+      </div>
+      {% endif %}
+    {% endfor %}
+  </div>
+  {% endif %}
+  {% if object.allow_comments %}
+    {% render_comment_form for object %}
+  {% else %}
+    <div id="comment_form">
+      <h3>Comments are closed.</h3>
+      <p>Comments have been close for this post.</p>
+    </div>
+  {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/post_list.html b/src/calibre/www/apps/blog/templates/blog/post_list.html
new file mode 100644
index 0000000000..399b1f0e6f
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/post_list.html
@@ -0,0 +1,35 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}Post archive{% endblock %}
+{% block body_class %}{{ block.super }} post_list{% endblock %}
+
+
+{% block content_title %}
+  <h2>Post archive</h2>
+{% endblock %}
+
+
+{% block content %}
+  <div class="post_list">
+    {% for post in object_list %}
+    <div>
+      <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
+      <p class="date">{{ post.publish|date:"Y F d" }}</p>
+      <p class="tease">{{ post.tease }}</p>
+    </div>
+    {% endfor %}
+  </div>
+  
+  {% if is_paginated %}
+  <p class="pagination">
+    {% if has_next %}
+    <a class="older" href="?page={{ next }}">Older</a>
+    {% endif %}
+    {% if has_next and has_previous %} | {% endif %}
+    {% if has_previous %}
+    <a class="newer" href="?page={{ previous }}">Newer</a>
+    {% endif %}
+  </p>
+  {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/blog/post_search.html b/src/calibre/www/apps/blog/templates/blog/post_search.html
new file mode 100644
index 0000000000..2884333f83
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/blog/post_search.html
@@ -0,0 +1,37 @@
+{% extends "blog/base_blog.html" %}
+
+
+{% block title %}Post search{% endblock %}
+{% block body_class %}{{ block.super }} post_search{% endblock %}
+
+
+{% block content_title %}
+  <h2>Search</h2>
+{% endblock %}
+
+
+{% block content %}
+  <form action="." method="get" id="post_search_form">
+    <p>
+      <input type="text" name="q" value="{{ search_term }}" id="search">
+      <input type="submit" class="button" value="Search">
+    </p>
+  </form>
+  
+  {% if message %}
+  <p class="message">{{ message }}</p>
+  {% endif %}
+  
+  {% if object_list %}
+  <div class="post_list">
+    {% for post in object_list %}
+    <div>
+      <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
+      <p class="date">{{ post.publish|date:"Y F d" }}</p>
+      <p class="tease">{{ post.tease }}</p>
+      <p class="comments">{% if comment_count %}{{ comment_count }} comment{{ comment_count|pluralize }}{% endif %}</p>
+    </div>
+    {% endfor %}
+  </div>
+  {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/feeds/posts_description.html b/src/calibre/www/apps/blog/templates/feeds/posts_description.html
new file mode 100644
index 0000000000..99216e812d
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/feeds/posts_description.html
@@ -0,0 +1 @@
+{{ obj.tease }}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/feeds/posts_title.html b/src/calibre/www/apps/blog/templates/feeds/posts_title.html
new file mode 100644
index 0000000000..7899fce3e8
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/feeds/posts_title.html
@@ -0,0 +1 @@
+{{ obj.title }}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templates/inlines/default.html b/src/calibre/www/apps/blog/templates/inlines/default.html
new file mode 100644
index 0000000000..5510ba9521
--- /dev/null
+++ b/src/calibre/www/apps/blog/templates/inlines/default.html
@@ -0,0 +1,7 @@
+{% if object %}
+  {{ object }}
+{% else %}
+  {% for object in object_list %}
+    {{ object }}
+  {% endfor %}
+{% endif %}
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/templatetags/__init__.py b/src/calibre/www/apps/blog/templatetags/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/www/apps/blog/templatetags/blog.py b/src/calibre/www/apps/blog/templatetags/blog.py
new file mode 100644
index 0000000000..e80918cb39
--- /dev/null
+++ b/src/calibre/www/apps/blog/templatetags/blog.py
@@ -0,0 +1,103 @@
+from django import template
+from django.conf import settings
+from django.db import models
+
+import re
+
+Post = models.get_model('blog', 'post')
+Category = models.get_model('blog', 'category')
+
+register = template.Library()
+
+
+class LatestPosts(template.Node):
+    def __init__(self, limit, var_name):
+        self.limit = limit
+        self.var_name = var_name
+
+    def render(self, context):
+        posts = Post.objects.published()[:int(self.limit)]
+        if posts and (int(self.limit) == 1):
+            context[self.var_name] = posts[0]
+        else:
+            context[self.var_name] = posts
+        return ''
+
+@register.tag
+def get_latest_posts(parser, token):
+    """
+    Gets any number of latest posts and stores them in a varable.
+
+    Syntax::
+
+        {% get_latest_posts [limit] as [var_name] %}
+
+    Example usage::
+
+        {% get_latest_posts 10 as latest_post_list %}
+    """
+    try:
+        tag_name, arg = token.contents.split(None, 1)
+    except ValueError:
+        raise template.TemplateSyntaxError, "%s tag requires arguments" % token.contents.split()[0]
+    m = re.search(r'(.*?) as (\w+)', arg)
+    if not m:
+        raise template.TemplateSyntaxError, "%s tag had invalid arguments" % tag_name
+    format_string, var_name = m.groups()
+    return LatestPosts(format_string, var_name)
+
+
+class BlogCategories(template.Node):
+    def __init__(self, var_name):
+        self.var_name = var_name
+
+    def render(self, context):
+        categories = Category.objects.all()
+        context[self.var_name] = categories
+        return ''
+
+@register.tag
+def get_blog_categories(parser, token):
+    """
+    Gets all blog categories.
+
+    Syntax::
+
+        {% get_blog_categories as [var_name] %}
+
+    Example usage::
+
+        {% get_blog_categories as category_list %}
+    """
+    try:
+        tag_name, arg = token.contents.split(None, 1)
+    except ValueError:
+        raise template.TemplateSyntaxError, "%s tag requires arguments" % token.contents.split()[0]
+    m = re.search(r'as (\w+)', arg)
+    if not m:
+        raise template.TemplateSyntaxError, "%s tag had invalid arguments" % tag_name
+    var_name = m.groups()[0]
+    return BlogCategories(var_name)
+
+
+@register.filter
+def get_links(value):
+    """
+    Extracts links from a ``Post`` body and returns a list.
+
+    Template Syntax::
+
+        {{ post.body|markdown:"safe"|get_links }}
+
+    """
+    try:
+        try:
+            from BeautifulSoup import BeautifulSoup
+        except ImportError:
+            from beautifulsoup import BeautifulSoup
+        soup = BeautifulSoup(value)
+        return soup.findAll('a')
+    except ImportError:
+        if settings.DEBUG:
+            raise template.TemplateSyntaxError, "Error in 'get_links' filter: BeautifulSoup isn't installed."
+    return value
diff --git a/src/calibre/www/apps/blog/tests.py b/src/calibre/www/apps/blog/tests.py
new file mode 100644
index 0000000000..b4297c4ee8
--- /dev/null
+++ b/src/calibre/www/apps/blog/tests.py
@@ -0,0 +1,66 @@
+"""
+>>> from django.test import Client
+>>> from calibre.www.apps.blog.models import Post, Category
+>>> import datetime
+>>> from django.core.urlresolvers import reverse
+>>> client = Client()
+
+>>> category = Category(title='Django', slug='django')
+>>> category.save()
+>>> category2 = Category(title='Rails', slug='rails')
+>>> category2.save()
+
+>>> post = Post(title='DJ Ango', slug='dj-ango', body='Yo DJ! Turn that music up!', status=2, publish=datetime.datetime(2008,5,5,16,20))
+>>> post.save()
+
+>>> post2 = Post(title='Where my grails at?', slug='where', body='I Can haz Holy plez?', status=2, publish=datetime.datetime(2008,4,2,11,11))
+>>> post2.save()
+
+>>> post.categories.add(category)
+>>> post2.categories.add(category2)
+
+>>> response = client.get(reverse('blog_index'))
+>>> response.context[-1]['object_list']
+[<Post: DJ Ango>, <Post: Where my grails at?>]
+>>> response.status_code
+200
+
+>>> response = client.get(reverse('blog_category_list'))
+>>> response.context[-1]['object_list']
+[<Category: Django>, <Category: Rails>]
+>>> response.status_code
+200
+
+>>> response = client.get(category.get_absolute_url())
+>>> response.context[-1]['object_list']
+[<Post: DJ Ango>]
+>>> response.status_code
+200
+
+>>> response = client.get(post.get_absolute_url())
+>>> response.context[-1]['object']
+<Post: DJ Ango>
+>>> response.status_code
+200
+
+>>> response = client.get(reverse('blog_search'), {'q': 'DJ'})
+>>> response.context[-1]['object_list']
+[<Post: DJ Ango>]
+>>> response.status_code
+200
+>>> response = client.get(reverse('blog_search'), {'q': 'Holy'})
+>>> response.context[-1]['object_list']
+[<Post: Where my grails at?>]
+>>> response.status_code
+200
+>>> response = client.get(reverse('blog_search'), {'q': ''})
+>>> response.context[-1]['message']
+'Search term was too vague. Please try again.'
+
+>>> response = client.get(reverse('blog_detail', args=[2008, 'apr', 2, 'where']))
+>>> response.context[-1]['object']
+<Post: Where my grails at?>
+>>> response.status_code
+200
+"""
+
diff --git a/src/calibre/www/apps/blog/urls.py b/src/calibre/www/apps/blog/urls.py
new file mode 100644
index 0000000000..222fc31e97
--- /dev/null
+++ b/src/calibre/www/apps/blog/urls.py
@@ -0,0 +1,41 @@
+from django.conf.urls.defaults import *
+from calibre.www.apps.blog import views as blog_views
+
+
+urlpatterns = patterns('',
+    url(r'^(?P<year>\d{4})/(?P<month>\w{3})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/$',
+        view=blog_views.post_detail,
+        name='blog_detail'),
+
+    url(r'^(?P<year>\d{4})/(?P<month>\w{3})/(?P<day>\d{1,2})/$',
+        view=blog_views.post_archive_day,
+        name='blog_archive_day'),
+
+    url(r'^(?P<year>\d{4})/(?P<month>\w{3})/$',
+        view=blog_views.post_archive_month,
+        name='blog_archive_month'),
+
+    url(r'^(?P<year>\d{4})/$',
+        view=blog_views.post_archive_year,
+        name='blog_archive_year'),
+
+    url(r'^categories/(?P<slug>[-\w]+)/$',
+        view=blog_views.category_detail,
+        name='blog_category_detail'),
+
+    url (r'^categories/$',
+        view=blog_views.category_list,
+        name='blog_category_list'),
+
+    url (r'^search/$',
+        view=blog_views.search,
+        name='blog_search'),
+
+    url(r'^page/(?P<page>\w)/$',
+        view=blog_views.post_list,
+        name='blog_index_paginated'),
+
+    url(r'^$',
+        view=blog_views.post_list,
+        name='blog_index'),
+)
\ No newline at end of file
diff --git a/src/calibre/www/apps/blog/views.py b/src/calibre/www/apps/blog/views.py
new file mode 100644
index 0000000000..2341140b36
--- /dev/null
+++ b/src/calibre/www/apps/blog/views.py
@@ -0,0 +1,160 @@
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+from django.http import Http404
+from django.views.generic import date_based, list_detail
+from django.db.models import Q
+from calibre.www.apps.blog.models import *
+
+import datetime
+import re
+
+
+def post_list(request, page=0, **kwargs):
+    return list_detail.object_list(
+        request,
+        queryset = Post.objects.published(),
+        paginate_by = 20,
+        page = page,
+        **kwargs
+    )
+post_list.__doc__ = list_detail.object_list.__doc__
+
+
+def post_archive_year(request, year, **kwargs):
+    return date_based.archive_year(
+        request,
+        year = year,
+        date_field = 'publish',
+        queryset = Post.objects.published(),
+        make_object_list = True,
+        **kwargs
+    )
+post_archive_year.__doc__ = date_based.archive_year.__doc__
+
+
+def post_archive_month(request, year, month, **kwargs):
+    return date_based.archive_month(
+        request,
+        year = year,
+        month = month,
+        date_field = 'publish',
+        queryset = Post.objects.published(),
+        **kwargs
+    )
+post_archive_month.__doc__ = date_based.archive_month.__doc__
+
+
+def post_archive_day(request, year, month, day, **kwargs):
+    return date_based.archive_day(
+        request,
+        year = year,
+        month = month,
+        day = day,
+        date_field = 'publish',
+        queryset = Post.objects.published(),
+        **kwargs
+    )
+post_archive_day.__doc__ = date_based.archive_day.__doc__
+
+
+def post_detail(request, slug, year, month, day, **kwargs):
+    return date_based.object_detail(
+        request,
+        year = year,
+        month = month,
+        day = day,
+        date_field = 'publish',
+        slug = slug,
+        queryset = Post.objects.published(),
+        **kwargs
+    )
+post_detail.__doc__ = date_based.object_detail.__doc__
+
+
+def category_list(request, template_name = 'blog/category_list.html', **kwargs):
+    """
+    Category list
+
+    Template: ``blog/category_list.html``
+    Context:
+        object_list
+            List of categories.
+    """
+    return list_detail.object_list(
+        request,
+        queryset = Category.objects.all(),
+        template_name = template_name,
+        **kwargs
+    )
+
+def category_detail(request, slug, template_name = 'blog/category_detail.html', **kwargs):
+    """
+    Category detail
+
+    Template: ``blog/category_detail.html``
+    Context:
+        object_list
+            List of posts specific to the given category.
+        category
+            Given category.
+    """
+    category = get_object_or_404(Category, slug__iexact=slug)
+
+    return list_detail.object_list(
+        request,
+        queryset = category.post_set.published(),
+        extra_context = {'category': category},
+        template_name = template_name,
+        **kwargs
+    )
+
+
+# Stop Words courtesy of http://www.dcs.gla.ac.uk/idom/ir_resources/linguistic_utils/stop_words
+STOP_WORDS = r"""\b(a|about|above|across|after|afterwards|again|against|all|almost|alone|along|already|also|
+although|always|am|among|amongst|amoungst|amount|an|and|another|any|anyhow|anyone|anything|anyway|anywhere|are|
+around|as|at|back|be|became|because|become|becomes|becoming|been|before|beforehand|behind|being|below|beside|
+besides|between|beyond|bill|both|bottom|but|by|call|can|cannot|cant|co|computer|con|could|couldnt|cry|de|describe|
+detail|do|done|down|due|during|each|eg|eight|either|eleven|else|elsewhere|empty|enough|etc|even|ever|every|everyone|
+everything|everywhere|except|few|fifteen|fify|fill|find|fire|first|five|for|former|formerly|forty|found|four|from|
+front|full|further|get|give|go|had|has|hasnt|have|he|hence|her|here|hereafter|hereby|herein|hereupon|hers|herself|
+him|himself|his|how|however|hundred|i|ie|if|in|inc|indeed|interest|into|is|it|its|itself|keep|last|latter|latterly|
+least|less|ltd|made|many|may|me|meanwhile|might|mill|mine|more|moreover|most|mostly|move|much|must|my|myself|name|
+namely|neither|never|nevertheless|next|nine|no|nobody|none|noone|nor|not|nothing|now|nowhere|of|off|often|on|once|
+one|only|onto|or|other|others|otherwise|our|ours|ourselves|out|over|own|part|per|perhaps|please|put|rather|re|same|
+see|seem|seemed|seeming|seems|serious|several|she|should|show|side|since|sincere|six|sixty|so|some|somehow|someone|
+something|sometime|sometimes|somewhere|still|such|system|take|ten|than|that|the|their|them|themselves|then|thence|
+there|thereafter|thereby|therefore|therein|thereupon|these|they|thick|thin|third|this|those|though|three|through|
+throughout|thru|thus|to|together|too|top|toward|towards|twelve|twenty|two|un|under|until|up|upon|us|very|via|was|
+we|well|were|what|whatever|when|whence|whenever|where|whereafter|whereas|whereby|wherein|whereupon|wherever|whether|
+which|while|whither|who|whoever|whole|whom|whose|why|will|with|within|without|would|yet|you|your|yours|yourself|
+yourselves)\b"""
+
+
+def search(request, template_name='blog/post_search.html'):
+    """
+    Search for blog posts.
+
+    This template will allow you to setup a simple search form that will try to return results based on
+    given search strings. The queries will be put through a stop words filter to remove words like
+    'the', 'a', or 'have' to help imporve the result set.
+
+    Template: ``blog/post_search.html``
+    Context:
+        object_list
+            List of blog posts that match given search term(s).
+        search_term
+            Given search term.
+    """
+    context = {}
+    if request.GET:
+        stop_word_list = re.compile(STOP_WORDS, re.IGNORECASE)
+        search_term = '%s' % request.GET['q']
+        cleaned_search_term = stop_word_list.sub('', search_term)
+        cleaned_search_term = cleaned_search_term.strip()
+        if len(cleaned_search_term) != 0:
+            post_list = Post.objects.published().filter(Q(body__icontains=cleaned_search_term) | Q(tags__icontains=cleaned_search_term) | Q(categories__title__icontains=cleaned_search_term))
+            context = {'object_list': post_list, 'search_term':search_term}
+        else:
+            message = 'Search term was too vague. Please try again.'
+            context = {'message':message}
+    return render_to_response(template_name, context, context_instance=RequestContext(request))
diff --git a/src/calibre/www/apps/feedjack/__init__.py b/src/calibre/www/apps/feedjack/__init__.py
new file mode 100644
index 0000000000..2d86e85ea9
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+__init__.py
+"""
+
diff --git a/src/calibre/www/apps/feedjack/admin.py b/src/calibre/www/apps/feedjack/admin.py
new file mode 100644
index 0000000000..7a910f9daf
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/admin.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+admin.py
+"""
+
+from django.contrib import admin
+from django.utils.translation import ugettext_lazy as _
+from calibre.www.apps.feedjack import models
+
+
+class LinkAdmin(admin.ModelAdmin):
+    pass
+
+
+
+class SiteAdmin(admin.ModelAdmin):
+    list_display = ('url', 'name')
+    filter_vertical = ('links',)
+
+
+
+class FeedAdmin(admin.ModelAdmin):
+    list_display = ('name', 'feed_url', 'title', 'last_modified', \
+      'is_active')
+    fieldsets = (
+      (None,
+        {'fields':('feed_url', 'name', 'shortname', 'is_active')}),
+      (_('Fields updated automatically by Feedjack'),
+        {'classes':('collapse',),
+         'fields':('title', 'tagline', 'link', 'etag', 'last_modified',
+                   'last_checked'),
+        })
+    )
+    search_fields = ['feed_url', 'name', 'title']
+
+
+
+class PostAdmin(admin.ModelAdmin):
+    list_display = ('title', 'link', 'author', 'date_modified')
+    search_fields = ['link', 'title']
+    date_hierarchy = 'date_modified'
+    filter_vertical = ('tags',)
+
+
+
+class SubscriberAdmin(admin.ModelAdmin):
+    list_display = ('name', 'site', 'feed')
+    list_filter = ('site',)
+
+
+admin.site.register(models.Link, LinkAdmin)
+admin.site.register(models.Site, SiteAdmin)
+admin.site.register(models.Feed, FeedAdmin)
+admin.site.register(models.Post, PostAdmin)
+admin.site.register(models.Subscriber, SubscriberAdmin)
+
+#~
diff --git a/src/calibre/www/apps/feedjack/fjcache.py b/src/calibre/www/apps/feedjack/fjcache.py
new file mode 100644
index 0000000000..f07d29765d
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/fjcache.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+fjcache.py
+"""
+
+import md5
+
+from django.core.cache import cache
+
+from django.conf import settings
+
+
+T_HOST = 1
+T_ITEM = 2
+T_META = 3
+
+
+def str2md5(key):
+    """ Returns the md5 hash of a string.
+    """
+    ctx = md5.new()
+    ctx.update(key.encode('utf-8'))
+    return ctx.hexdigest()
+
+def getkey(stype, site_id=None, key=None):
+    """ Returns the cache key depending on it's type.
+    """
+    base = '%s.feedjack' % (settings.CACHE_MIDDLEWARE_KEY_PREFIX)
+    if stype == T_HOST:
+        return '%s.hostcache' % base
+    elif stype == T_ITEM:
+        return '%s.%d.item.%s' % (base, site_id, str2md5(key))
+    elif stype == T_META:
+        return '%s.%d.meta' % (base, site_id)
+
+
+def hostcache_get():
+    """ Retrieves the hostcache dictionary
+    """
+    return cache.get(getkey(T_HOST))
+
+def hostcache_set(value):
+    """ Sets the hostcache dictionary
+    """
+    cache.set(getkey(T_HOST), value)
+
+def cache_get(site_id, key):
+    """ Retrieves cache data from a site.
+    """
+    return cache.get(getkey(T_ITEM, site_id, key))
+
+def cache_set(site, key, data):
+    """ Sets cache data for a site.
+    
+    All keys related to a site are stored in a meta key. This key is per-site.
+    """
+    tkey = getkey(T_ITEM, site.id, key)
+    mkey = getkey(T_META, site.id)
+    tmp = cache.get(mkey)
+    longdur = 365*24*60*60
+    if not tmp:
+        tmp = [tkey]
+        cache.set(mkey, [tkey], longdur)
+    elif tkey not in tmp:
+        tmp.append(tkey)
+        cache.set(mkey, tmp, longdur)
+    cache.set(tkey, data, site.cache_duration)
+
+def cache_delsite(site_id):
+    """ Removes all cache data from a site.
+    """
+    mkey = getkey(T_META, site_id)
+    tmp = cache.get(mkey)
+    if not tmp:
+        return
+    for tkey in tmp:
+        cache.delete(tkey)
+    cache.delete(mkey)
+
+
diff --git a/src/calibre/www/apps/feedjack/fjcloud.py b/src/calibre/www/apps/feedjack/fjcloud.py
new file mode 100644
index 0000000000..9bf42550c5
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/fjcloud.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+fjcloud.py
+"""
+
+import math
+
+from calibre.www.apps.feedjack import fjlib, fjcache
+
+def getsteps(levels, tagmax):
+    """ Returns a list with the max number of posts per "tagcloud level"
+    """
+    ntw = levels
+    if ntw < 2:
+        ntw = 2
+
+    steps = [(stp, 1 + (stp * int(math.ceil(tagmax * 1.0 / ntw - 1))))
+              for stp in range(ntw)]
+    # just to be sure~
+    steps[-1] = (steps[-1][0], tagmax+1)
+    return steps
+
+def build(site, tagdata):
+    """ Returns the tag cloud for a list of tags.
+    """
+
+    tagdata.sort()
+
+    # we get the most popular tag to calculate the tags' weigth
+    tagmax = 0
+    for tagname, tagcount in tagdata:
+        if tagcount > tagmax:
+            tagmax = tagcount
+    steps = getsteps(site.tagcloud_levels, tagmax)
+
+    tags = []
+    for tagname, tagcount in tagdata:
+        weight = [twt[0] \
+          for twt in steps if twt[1] >= tagcount and twt[1] > 0][0]+1
+        tags.append({'tagname':tagname, 'count':tagcount, 'weight':weight})
+    return tags
+
+def cloudata(site):
+    """ Returns a dictionary with all the tag clouds related to a site.
+    """
+
+    tagdata = fjlib.getquery("""
+          SELECT feedjack_post.feed_id, feedjack_tag.name, COUNT(*)
+          FROM feedjack_post, feedjack_subscriber, feedjack_tag,
+          feedjack_post_tags
+          WHERE feedjack_post.feed_id=feedjack_subscriber.feed_id AND
+          feedjack_post_tags.tag_id=feedjack_tag.id AND
+          feedjack_post_tags.post_id=feedjack_post.id AND
+          feedjack_subscriber.site_id=%d
+          GROUP BY feedjack_post.feed_id, feedjack_tag.name
+          ORDER BY feedjack_post.feed_id, feedjack_tag.name""" % site.id)
+    tagdict = {}
+    globaldict = {}
+    cloudict = {}
+    for feed_id, tagname, tagcount in tagdata:
+        if feed_id not in tagdict:
+            tagdict[feed_id] = []
+        tagdict[feed_id].append((tagname, tagcount))
+        try:
+            globaldict[tagname] += tagcount
+        except KeyError:
+            globaldict[tagname] = tagcount
+    tagdict[0] = globaldict.items()
+    for key, val in tagdict.items():
+        cloudict[key] = build(site, val)
+    return cloudict
+
+def getcloud(site, feed_id=None):
+    """ Returns the tag cloud for a site or a site's subscriber.
+    """
+
+    cloudict = fjcache.cache_get(site.id, 'tagclouds')
+    if not cloudict:
+        cloudict = cloudata(site)
+        fjcache.cache_set(site, 'tagclouds', cloudict)
+
+    # A subscriber's tag cloud has been requested.
+    if feed_id:
+        feed_id = int(feed_id)
+        if feed_id in cloudict:
+            return cloudict[feed_id]
+        return []
+    # The site tagcloud has been requested.
+    return cloudict[0]
+
diff --git a/src/calibre/www/apps/feedjack/fjlib.py b/src/calibre/www/apps/feedjack/fjlib.py
new file mode 100644
index 0000000000..2801d59a70
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/fjlib.py
@@ -0,0 +1,280 @@
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+fjlib.py
+"""
+
+from django.db import connection
+from django.core.paginator import Paginator, InvalidPage
+from django.http import Http404
+from django.utils.encoding import smart_unicode
+
+from calibre.www.apps.feedjack import models, fjcache
+
+class PageNotAnInteger(ValueError):
+    pass
+
+# this is taken from django, it was removed in r8191
+class ObjectPaginator(Paginator):
+    """
+    Legacy ObjectPaginator class, for backwards compatibility.
+
+    Note that each method on this class that takes page_number expects a
+    zero-based page number, whereas the new API (Paginator/Page) uses one-based
+    page numbers.
+    """
+    def __init__(self, query_set, num_per_page, orphans=0):
+        Paginator.__init__(self, query_set, num_per_page, orphans)
+        import warnings
+        warnings.warn("The ObjectPaginator is deprecated. Use django.core.paginator.Paginator instead.", DeprecationWarning)
+
+        # Keep these attributes around for backwards compatibility.
+        self.query_set = query_set
+        self.num_per_page = num_per_page
+        self._hits = self._pages = None
+
+    def validate_page_number(self, page_number):
+        try:
+            page_number = int(page_number) + 1
+        except ValueError:
+            raise PageNotAnInteger
+        return self.validate_number(page_number)
+
+    def get_page(self, page_number):
+        try:
+            page_number = int(page_number) + 1
+        except ValueError:
+            raise PageNotAnInteger
+        return self.page(page_number).object_list
+
+    def has_next_page(self, page_number):
+        return page_number < self.pages - 1
+
+    def has_previous_page(self, page_number):
+        return page_number > 0
+
+    def first_on_page(self, page_number):
+        """
+        Returns the 1-based index of the first object on the given page,
+        relative to total objects found (hits).
+        """
+        page_number = self.validate_page_number(page_number)
+        return (self.num_per_page * (page_number - 1)) + 1
+
+    def last_on_page(self, page_number):
+        """
+        Returns the 1-based index of the last object on the given page,
+        relative to total objects found (hits).
+        """
+        page_number = self.validate_page_number(page_number)
+        if page_number == self.num_pages:
+            return self.count
+        return page_number * self.num_per_page
+
+    # The old API called it "hits" instead of "count".
+    hits = Paginator.count
+
+    # The old API called it "pages" instead of "num_pages".
+    pages = Paginator.num_pages
+
+
+def sitefeeds(siteobj):
+    """ Returns the active feeds of a site.
+    """
+    return siteobj.subscriber_set.filter(is_active=True).select_related()
+    #return [subscriber['feed'] \
+    #  for subscriber \
+    #  in siteobj.subscriber_set.filter(is_active=True).values('feed')]
+
+def getquery(query):
+    """ Performs a query and get the results.
+    """
+    try:
+        conn = connection.cursor()
+        conn.execute(query)
+        data = conn.fetchall()
+        conn.close()
+    except:
+        data = []
+    return data
+
+def get_extra_content(site, sfeeds_ids, ctx):
+    """ Returns extra data useful to the templates.
+    """
+
+    # get the subscribers' feeds
+    if sfeeds_ids:
+        basefeeds = models.Feed.objects.filter(id__in=sfeeds_ids)
+        try:
+            ctx['feeds'] = basefeeds.order_by('name').select_related()
+        except:
+            ctx['feeds'] = []
+
+        # get the last_checked time
+        try:
+            ctx['last_modified'] = basefeeds.filter(\
+              last_checked__isnull=False).order_by(\
+              '-last_checked').select_related()[0].last_checked.ctime()
+
+        except:
+            ctx['last_modified'] = '??'
+    else:
+        ctx['feeds'] = []
+        ctx['last_modified'] = '??'
+    ctx['site'] = site
+
+def get_posts_tags(object_list, sfeeds_obj, user_id, tag_name):
+    """ Adds a qtags property in every post object in a page.
+
+    Use "qtags" instead of "tags" in templates to avoid unnecessary DB hits.
+    """
+    tagd = {}
+    user_obj = None
+    tag_obj = None
+    tags = models.Tag.objects.extra(\
+      select={'post_id':'%s.%s' % (\
+        connection.ops.quote_name('feedjack_post_tags'), \
+        connection.ops.quote_name('post_id'))}, \
+      tables=['feedjack_post_tags'], \
+      where=[\
+        '%s.%s=%s.%s' % (\
+          connection.ops.quote_name('feedjack_tag'), \
+          connection.ops.quote_name('id'), \
+          connection.ops.quote_name('feedjack_post_tags'), \
+          connection.ops.quote_name('tag_id')), \
+        '%s.%s IN (%s)' % (\
+          connection.ops.quote_name('feedjack_post_tags'), \
+          connection.ops.quote_name('post_id'), \
+          ', '.join([str(post.id) for post in object_list]))])
+    for tag in tags:
+        if tag.post_id not in tagd:
+            tagd[tag.post_id] = []
+        tagd[tag.post_id].append(tag)
+        if tag_name and tag.name == tag_name:
+            tag_obj = tag
+    subd = {}
+    for sub in sfeeds_obj:
+        subd[sub.feed.id] = sub
+    for post in object_list:
+        if post.id in tagd:
+            post.qtags = tagd[post.id]
+        else:
+            post.qtags = []
+        post.subscriber = subd[post.feed.id]
+        if user_id and int(user_id) == post.feed.id:
+            user_obj = post.subscriber
+    return user_obj, tag_obj
+
+def getcurrentsite(http_post, path_info, query_string):
+    """ Returns the site id and the page cache key based on the request.
+    """
+    url = u'http://%s/%s' % (smart_unicode(http_post.rstrip('/')), \
+      smart_unicode(path_info.lstrip('/')))
+    pagecachekey = '%s?%s' % (smart_unicode(path_info), \
+      smart_unicode(query_string))
+    hostdict = fjcache.hostcache_get()
+
+    if not hostdict:
+        hostdict = {}
+    if url not in hostdict:
+        default, ret = None, None
+        for site in models.Site.objects.all():
+            if url.startswith(site.url):
+                ret = site
+                break
+            if not default or site.default_site:
+                default = site
+        if not ret:
+            if default:
+                ret = default
+            else:
+                # Somebody is requesting something, but the user didn't create
+                # a site yet. Creating a default one...
+                ret = models.Site(name='Default Feedjack Site/Planet', \
+                  url='www.feedjack.org', \
+                  title='Feedjack Site Title', \
+                  description='Feedjack Site Description. ' \
+                    'Please change this in the admin interface.')
+                ret.save()
+        hostdict[url] = ret.id
+        fjcache.hostcache_set(hostdict)
+
+    return hostdict[url], pagecachekey
+
+def get_paginator(site, sfeeds_ids, page=0, tag=None, user=None):
+    """ Returns a paginator object and a requested page from it.
+    """
+
+    if tag:
+        try:
+            localposts = models.Tag.objects.get(name=tag).post_set.filter(\
+              feed__in=sfeeds_ids)
+        except:
+            raise Http404
+    else:
+        localposts = models.Post.objects.filter(feed__in=sfeeds_ids)
+
+    if user:
+        try:
+            localposts = localposts.filter(feed=user)
+        except:
+            raise Http404
+    if site.order_posts_by == 2:
+        localposts = localposts.order_by('-date_created', '-date_modified')
+    else:
+        localposts = localposts.order_by('-date_modified')
+
+    paginator = ObjectPaginator(localposts.select_related(), \
+      site.posts_per_page)
+    try:
+        object_list = paginator.get_page(page)
+    except InvalidPage:
+        if page == 0:
+            object_list = []
+        else:
+            raise Http404
+    return (paginator, object_list)
+
+def page_context(request, site, tag=None, user_id=None, sfeeds=None):
+    """ Returns the context dictionary for a page view.
+    """
+    sfeeds_obj, sfeeds_ids = sfeeds
+    try:
+        page = int(request.GET.get('page', 0))
+    except ValueError:
+        page = 0
+    paginator, object_list = get_paginator(site, sfeeds_ids, \
+      page=page, tag=tag, user=user_id)
+    if object_list:
+        # This will hit the DB once per page instead of once for every post in
+        # a page. To take advantage of this the template designer must call
+        # the qtags property in every item, instead of the default tags
+        # property.
+        user_obj, tag_obj = get_posts_tags(object_list, sfeeds_obj, \
+          user_id, tag)
+    else:
+        user_obj, tag_obj = None, None
+    ctx = {
+        'object_list': object_list,
+        'is_paginated': paginator.pages > 1,
+        'results_per_page': site.posts_per_page,
+        'has_next': paginator.has_next_page(page),
+        'has_previous': paginator.has_previous_page(page),
+        'page': page + 1,
+        'next': page + 1,
+        'previous': page - 1,
+        'pages': paginator.pages,
+        'hits' : paginator.hits,
+    }
+    get_extra_content(site, sfeeds_ids, ctx)
+    from calibre.www.apps.feedjack import fjcloud
+    ctx['tagcloud'] = fjcloud.getcloud(site, user_id)
+    ctx['user_id'] = user_id
+    ctx['user'] = user_obj
+    ctx['tag'] = tag_obj
+    ctx['subscribers'] = sfeeds_obj
+    return ctx
+
+
diff --git a/src/calibre/www/apps/feedjack/models.py b/src/calibre/www/apps/feedjack/models.py
new file mode 100644
index 0000000000..c2e563f9fa
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/models.py
@@ -0,0 +1,202 @@
+# -*- coding: utf-8 -*-
+# pylint: disable-msg=W0232, R0903, W0131
+
+"""
+feedjack
+Gustavo Picón
+models.py
+"""
+
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import smart_unicode
+
+from calibre.www.apps.feedjack import fjcache
+
+SITE_ORDERBY_CHOICES = (
+    (1, _('Date published.')),
+    (2, _('Date the post was first obtained.'))
+)
+
+class Link(models.Model):
+    name = models.CharField(_('name'), max_length=100, unique=True)
+    link = models.URLField(_('link'), verify_exists=True)
+
+    class Meta:
+        verbose_name = _('link')
+        verbose_name_plural = _('links')
+
+    class Admin:
+        pass
+
+    def __unicode__(self):
+        return u'%s (%s)' % (self.name, self.link)
+
+
+
+class Site(models.Model):
+    name = models.CharField(_('name'), max_length=100)
+    url = models.CharField(_('url'),
+      max_length=100,
+      unique=True,
+      help_text=u'%s: %s, %s' % (smart_unicode(_('Example')),
+        u'http://www.planetexample.com',
+        u'http://www.planetexample.com:8000/foo'))
+    title = models.CharField(_('title'), max_length=200)
+    description = models.TextField(_('description'))
+    welcome = models.TextField(_('welcome'), null=True, blank=True)
+    greets = models.TextField(_('greets'), null=True, blank=True)
+
+    default_site = models.BooleanField(_('default site'), default=False)
+    posts_per_page = models.IntegerField(_('posts per page'), default=20)
+    order_posts_by = models.IntegerField(_('order posts by'), default=1,
+        choices=SITE_ORDERBY_CHOICES)
+    tagcloud_levels = models.IntegerField(_('tagcloud level'), default=5)
+    show_tagcloud = models.BooleanField(_('show tagcloud'), default=True)
+
+    use_internal_cache = models.BooleanField(_('use internal cache'), default=True)
+    cache_duration = models.IntegerField(_('cache duration'), default=60*60*24,
+        help_text=_('Duration in seconds of the cached pages and data.') )
+
+    links = models.ManyToManyField(Link, verbose_name=_('links'),
+      null=True, blank=True)
+    template = models.CharField(_('template'), max_length=100, null=True,
+      blank=True,
+      help_text=_('This template must be a directory in your feedjack '
+        'templates directory. Leave blank to use the default template.') )
+
+    class Meta:
+        verbose_name = _('site')
+        verbose_name_plural = _('sites')
+        ordering = ('name',)
+
+    def __unicode__(self):
+        return self.name
+
+    def save(self):
+        if not self.template:
+            self.template = 'default'
+        # there must be only ONE default site
+        defs = Site.objects.filter(default_site=True)
+        if not defs:
+            self.default_site = True
+        elif self.default_site:
+            for tdef in defs:
+                if tdef.id != self.id:
+                    tdef.default_site = False
+                    tdef.save()
+        self.url = self.url.rstrip('/')
+        fjcache.hostcache_set({})
+        super(Site, self).save()
+
+
+
+
+class Feed(models.Model):
+    feed_url = models.URLField(_('feed url'), unique=True)
+
+    name = models.CharField(_('name'), max_length=100)
+    shortname = models.CharField(_('shortname'), max_length=50)
+    is_active = models.BooleanField(_('is active'), default=True,
+        help_text=_('If disabled, this feed will not be further updated.') )
+
+    title = models.CharField(_('title'), max_length=200, blank=True)
+    tagline = models.TextField(_('tagline'), blank=True)
+    link = models.URLField(_('link'), blank=True)
+
+    # http://feedparser.org/docs/http-etag.html
+    etag = models.CharField(_('etag'), max_length=50, blank=True)
+    last_modified = models.DateTimeField(_('last modified'), null=True, blank=True)
+    last_checked = models.DateTimeField(_('last checked'), null=True, blank=True)
+
+    class Meta:
+        verbose_name = _('feed')
+        verbose_name_plural = _('feeds')
+        ordering = ('name', 'feed_url',)
+
+    def __unicode__(self):
+        return u'%s (%s)' % (self.name, self.feed_url)
+
+    def save(self):
+        super(Feed, self).save()
+
+
+
+class Tag(models.Model):
+    name = models.CharField(_('name'), max_length=50, unique=True)
+
+    class Meta:
+        verbose_name = _('tag')
+        verbose_name_plural = _('tags')
+        ordering = ('name',)
+
+    def __unicode__(self):
+        return self.name
+
+    def save(self):
+        super(Tag, self).save()
+
+class Post(models.Model):
+    feed = models.ForeignKey(Feed, verbose_name=_('feed'), null=False, blank=False)
+    title = models.CharField(_('title'), max_length=255)
+    link = models.URLField(_('link'), )
+    content = models.TextField(_('content'), blank=True)
+    date_modified = models.DateTimeField(_('date modified'), null=True, blank=True)
+    guid = models.CharField(_('guid'), max_length=200, db_index=True)
+    author = models.CharField(_('author'), max_length=50, blank=True)
+    author_email = models.EmailField(_('author email'), blank=True)
+    comments = models.URLField(_('comments'), blank=True)
+    tags = models.ManyToManyField(Tag, verbose_name=_('tags'))
+    date_created = models.DateField(_('date created'), auto_now_add=True)
+
+    class Meta:
+        verbose_name = _('post')
+        verbose_name_plural = _('posts')
+        ordering = ('-date_modified',)
+        unique_together = (('feed', 'guid'),)
+
+    def __unicode__(self):
+        return self.title
+
+    def save(self):
+        super(Post, self).save()
+
+    def get_absolute_url(self):
+        return self.link
+
+
+
+class Subscriber(models.Model):
+    site = models.ForeignKey(Site, verbose_name=_('site') )
+    feed = models.ForeignKey(Feed, verbose_name=_('feed') )
+
+    name = models.CharField(_('name'), max_length=100, null=True, blank=True,
+        help_text=_('Keep blank to use the Feed\'s original name.') )
+    shortname = models.CharField(_('shortname'), max_length=50, null=True,
+      blank=True,
+      help_text=_('Keep blank to use the Feed\'s original shortname.') )
+    is_active = models.BooleanField(_('is active'), default=True,
+        help_text=_('If disabled, this subscriber will not appear in the site or '
+        'in the site\'s feed.') )
+
+    class Meta:
+        verbose_name = _('subscriber')
+        verbose_name_plural = _('subscribers')
+        ordering = ('site', 'name', 'feed')
+        unique_together = (('site', 'feed'),)
+
+    def __unicode__(self):
+        return u'%s in %s' % (self.feed, self.site)
+
+    def get_cloud(self):
+        from calibre.www.apps.feedjack import fjcloud
+        return fjcloud.getcloud(self.site, self.feed.id)
+
+    def save(self):
+        if not self.name:
+            self.name = self.feed.name
+        if not self.shortname:
+            self.shortname = self.feed.shortname
+        super(Subscriber, self).save()
+
+
diff --git a/src/calibre/www/apps/feedjack/update.py b/src/calibre/www/apps/feedjack/update.py
new file mode 100755
index 0000000000..417c45ab8d
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/update.py
@@ -0,0 +1,506 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+update_feeds.py
+"""
+
+import os
+import time
+import optparse
+import datetime
+import socket
+import traceback
+import sys
+
+import feedparser
+
+try:
+    import threadpool
+except ImportError:
+    threadpool = None
+
+VERSION = '0.9.16'
+URL = 'http://www.feedjack.org/'
+USER_AGENT = 'Feedjack %s - %s' % (VERSION, URL)
+SLOWFEED_WARNING = 10
+ENTRY_NEW, ENTRY_UPDATED, ENTRY_SAME, ENTRY_ERR = range(4)
+FEED_OK, FEED_SAME, FEED_ERRPARSE, FEED_ERRHTTP, FEED_ERREXC = range(5)
+
+
+def encode(tstr):
+    """ Encodes a unicode string in utf-8
+    """
+    if not tstr:
+        return ''
+    # this is _not_ pretty, but it works
+    try:
+        return tstr.encode('utf-8', "xmlcharrefreplace")
+    except UnicodeDecodeError:
+        # it's already UTF8.. sigh
+        return tstr.decode('utf-8').encode('utf-8')
+
+def prints(tstr):
+    """ lovely unicode
+    """
+    sys.stdout.write('%s\n' % (tstr.encode(sys.getdefaultencoding(),
+                         'replace')))
+    sys.stdout.flush()
+
+def mtime(ttime):
+    """ datetime auxiliar function.
+    """
+    return datetime.datetime.fromtimestamp(time.mktime(ttime))
+
+class ProcessEntry:
+    def __init__(self, feed, options, entry, postdict, fpf):
+        self.feed = feed
+        self.options = options
+        self.entry = entry
+        self.postdict = postdict
+        self.fpf = fpf
+
+    def get_tags(self):
+        """ Returns a list of tag objects from an entry.
+        """
+        from calibre.www.apps.feedjack import models
+
+        fcat = []
+        if self.entry.has_key('tags'):
+            for tcat in self.entry.tags:
+                if tcat.label != None:
+                    term = tcat.label
+                else:
+                    term = tcat.term
+                qcat = term.strip()
+                if ',' in qcat or '/' in qcat:
+                    qcat = qcat.replace(',', '/').split('/')
+                else:
+                    qcat = [qcat]
+                for zcat in qcat:
+                    tagname = zcat.lower()
+                    while '  ' in tagname:
+                        tagname = tagname.replace('  ', ' ')
+                    tagname = tagname.strip()
+                    if not tagname or tagname == ' ':
+                        continue
+                    if not models.Tag.objects.filter(name=tagname):
+                        cobj = models.Tag(name=tagname)
+                        cobj.save()
+                    fcat.append(models.Tag.objects.get(name=tagname))
+        return fcat
+
+    def get_entry_data(self):
+        """ Retrieves data from a post and returns it in a tuple.
+        """
+        try:
+            link = self.entry.link
+        except AttributeError:
+            link = self.feed.link
+        try:
+            title = self.entry.title
+        except AttributeError:
+            title = link
+        guid = self.entry.get('id', title)
+
+        if self.entry.has_key('author_detail'):
+            author = self.entry.author_detail.get('name', '')
+            author_email = self.entry.author_detail.get('email', '')
+        else:
+            author, author_email = '', ''
+
+        if not author:
+            author = self.entry.get('author', self.entry.get('creator', ''))
+        if not author_email:
+            # this should be optional~
+            author_email = 'nospam@nospam.com'
+
+        try:
+            content = self.entry.content[0].value
+        except:
+            content = self.entry.get('summary',
+                                     self.entry.get('description', ''))
+
+        if self.entry.has_key('modified_parsed'):
+            date_modified = mtime(self.entry.modified_parsed)
+        else:
+            date_modified = None
+
+        fcat = self.get_tags()
+        comments = self.entry.get('comments', '')
+
+        return (link, title, guid, author, author_email, content,
+                date_modified, fcat, comments)
+
+    def process(self):
+        """ Process a post in a feed and saves it in the DB if necessary.
+        """
+        from calibre.www.apps.feedjack import models
+
+        (link, title, guid, author, author_email, content, date_modified,
+         fcat, comments) = self.get_entry_data()
+
+        if False and self.options.verbose:
+            prints(u'[%d] Entry\n' \
+                   u'  title: %s\n' \
+                   u'  link: %s\n' \
+                   u'  guid: %s\n' \
+                   u'  author: %s\n' \
+                   u'  author_email: %s\n' \
+                   u'  tags: %s' % (
+                self.feed.id,
+                title, link, guid, author, author_email,
+                u' '.join(tcat.name for tcat in fcat)))
+
+        if guid in self.postdict:
+            tobj = self.postdict[guid]
+            if tobj.content != content or (date_modified and
+                    tobj.date_modified != date_modified):
+                retval = ENTRY_UPDATED
+                if self.options.verbose:
+                    prints('[%d] Updating existing post: %s' % (
+                           self.feed.id, link))
+                if not date_modified:
+                    # damn non-standard feeds
+                    date_modified = tobj.date_modified
+                tobj.title = title
+                tobj.link = link
+                tobj.content = content
+                tobj.guid = guid
+                tobj.date_modified = date_modified
+                tobj.author = author
+                tobj.author_email = author_email
+                tobj.comments = comments
+                tobj.tags.clear()
+                [tobj.tags.add(tcat) for tcat in fcat]
+                tobj.save()
+            else:
+                retval = ENTRY_SAME
+                if self.options.verbose:
+                    prints('[%d] Post has not changed: %s' % (self.feed.id,
+                                                              link))
+        else:
+            retval = ENTRY_NEW
+            if self.options.verbose:
+                prints('[%d] Saving new post: %s' % (self.feed.id, link))
+            if not date_modified and self.fpf:
+                # if the feed has no date_modified info, we use the feed
+                # mtime or the current time
+                if self.fpf.feed.has_key('modified_parsed'):
+                    date_modified = mtime(self.fpf.feed.modified_parsed)
+                elif self.fpf.has_key('modified'):
+                    date_modified = mtime(self.fpf.modified)
+            if not date_modified:
+                date_modified = datetime.datetime.now()
+            tobj = models.Post(feed=self.feed, title=title, link=link,
+                content=content, guid=guid, date_modified=date_modified,
+                author=author, author_email=author_email,
+                comments=comments)
+            tobj.save()
+            [tobj.tags.add(tcat) for tcat in fcat]
+        return retval
+
+
+class ProcessFeed:
+    def __init__(self, feed, options):
+        self.feed = feed
+        self.options = options
+        self.fpf = None
+
+    def process_entry(self, entry, postdict):
+        """ wrapper for ProcessEntry
+        """
+        entry = ProcessEntry(self.feed, self.options, entry, postdict,
+                             self.fpf)
+        ret_entry = entry.process()
+        del entry
+        return ret_entry
+
+    def process(self):
+        """ Downloads and parses a feed.
+        """
+        from calibre.www.apps.feedjack import models
+
+        ret_values = {
+            ENTRY_NEW:0,
+            ENTRY_UPDATED:0,
+            ENTRY_SAME:0,
+            ENTRY_ERR:0}
+
+        prints(u'[%d] Processing feed %s' % (self.feed.id,
+                                             self.feed.feed_url))
+
+        # we check the etag and the modified time to save bandwith and
+        # avoid bans
+        try:
+            self.fpf = feedparser.parse(self.feed.feed_url,
+                                        agent=USER_AGENT,
+                                        etag=self.feed.etag)
+        except:
+            prints('! ERROR: feed cannot be parsed')
+            return FEED_ERRPARSE, ret_values
+
+        if hasattr(self.fpf, 'status'):
+            if self.options.verbose:
+                prints(u'[%d] HTTP status %d: %s' % (self.feed.id,
+                                                     self.fpf.status,
+                                                     self.feed.feed_url))
+            if self.fpf.status == 304:
+                # this means the feed has not changed
+                if self.options.verbose:
+                    prints('[%d] Feed has not changed since ' \
+                           'last check: %s' % (self.feed.id,
+                                               self.feed.feed_url))
+                return FEED_SAME, ret_values
+
+            if self.fpf.status >= 400:
+                # http error, ignore
+                prints('[%d] !HTTP_ERROR! %d: %s' % (self.feed.id,
+                                                     self.fpf.status,
+                                                     self.feed.feed_url))
+                return FEED_ERRHTTP, ret_values
+
+        if hasattr(self.fpf, 'bozo') and self.fpf.bozo:
+            prints('[%d] !BOZO! Feed is not well formed: %s' % (
+                self.feed.id, self.feed.feed_url))
+
+        # the feed has changed (or it is the first time we parse it)
+        # saving the etag and last_modified fields
+        self.feed.etag = self.fpf.get('etag', '')
+        # some times this is None (it never should) *sigh*
+        if self.feed.etag is None:
+            self.feed.etag = ''
+
+        try:
+            self.feed.last_modified = mtime(self.fpf.modified)
+        except:
+            pass
+
+        self.feed.title = self.fpf.feed.get('title', '')[0:254]
+        self.feed.tagline = self.fpf.feed.get('tagline', '')
+        self.feed.link = self.fpf.feed.get('link', '')
+        self.feed.last_checked = datetime.datetime.now()
+
+        if False and self.options.verbose:
+            prints(u'[%d] Feed info for: %s\n' \
+                   u'  title %s\n' \
+                   u'  tagline %s\n' \
+                   u'  link %s\n' \
+                   u'  last_checked %s' % (
+                self.feed.id, self.feed.feed_url, self.feed.title,
+                self.feed.tagline, self.feed.link, self.feed.last_checked))
+
+        guids = []
+        for entry in self.fpf.entries:
+            if entry.get('id', ''):
+                guids.append(entry.get('id', ''))
+            elif entry.title:
+                guids.append(entry.title)
+            elif entry.link:
+                guids.append(entry.link)
+        self.feed.save()
+        if guids:
+            postdict = dict([(post.guid, post)
+              for post in models.Post.objects.filter(
+                   feed=self.feed.id).filter(guid__in=guids)])
+        else:
+            postdict = {}
+
+        for entry in self.fpf.entries:
+            try:
+                ret_entry = self.process_entry(entry, postdict)
+            except:
+                (etype, eobj, etb) = sys.exc_info()
+                print '[%d] ! -------------------------' % (self.feed.id,)
+                print traceback.format_exception(etype, eobj, etb)
+                traceback.print_exception(etype, eobj, etb)
+                print '[%d] ! -------------------------' % (self.feed.id,)
+                ret_entry = ENTRY_ERR
+            ret_values[ret_entry] += 1
+
+        self.feed.save()
+
+        return FEED_OK, ret_values
+
+class Dispatcher:
+    def __init__(self, options, num_threads):
+        self.options = options
+        self.entry_stats = {
+            ENTRY_NEW:0,
+            ENTRY_UPDATED:0,
+            ENTRY_SAME:0,
+            ENTRY_ERR:0}
+        self.feed_stats = {
+            FEED_OK:0,
+            FEED_SAME:0,
+            FEED_ERRPARSE:0,
+            FEED_ERRHTTP:0,
+            FEED_ERREXC:0}
+        self.entry_trans = {
+            ENTRY_NEW:'new',
+            ENTRY_UPDATED:'updated',
+            ENTRY_SAME:'same',
+            ENTRY_ERR:'error'}
+        self.feed_trans = {
+            FEED_OK:'ok',
+            FEED_SAME:'unchanged',
+            FEED_ERRPARSE:'cant_parse',
+            FEED_ERRHTTP:'http_error',
+            FEED_ERREXC:'exception'}
+        self.entry_keys = sorted(self.entry_trans.keys())
+        self.feed_keys = sorted(self.feed_trans.keys())
+        if threadpool:
+            self.tpool = threadpool.ThreadPool(num_threads)
+        else:
+            self.tpool = None
+        self.time_start = datetime.datetime.now()
+
+
+    def add_job(self, feed):
+        """ adds a feed processing job to the pool
+        """
+        if self.tpool:
+            req = threadpool.WorkRequest(self.process_feed_wrapper,
+                (feed,))
+            self.tpool.putRequest(req)
+        else:
+            # no threadpool module, just run the job
+            self.process_feed_wrapper(feed)
+
+    def process_feed_wrapper(self, feed):
+        """ wrapper for ProcessFeed
+        """
+        start_time = datetime.datetime.now()
+        try:
+            pfeed = ProcessFeed(feed, self.options)
+            ret_feed, ret_entries = pfeed.process()
+            del pfeed
+        except:
+            (etype, eobj, etb) = sys.exc_info()
+            print '[%d] ! -------------------------' % (feed.id,)
+            print traceback.format_exception(etype, eobj, etb)
+            traceback.print_exception(etype, eobj, etb)
+            print '[%d] ! -------------------------' % (feed.id,)
+            ret_feed = FEED_ERREXC
+            ret_entries = {}
+
+        delta = datetime.datetime.now() - start_time
+        if delta.seconds > SLOWFEED_WARNING:
+            comment = u' (SLOW FEED!)'
+        else:
+            comment = u''
+        prints(u'[%d] Processed %s in %s [%s] [%s]%s' % (
+            feed.id, feed.feed_url, unicode(delta),
+            self.feed_trans[ret_feed],
+            u' '.join(u'%s=%d' % (self.entry_trans[key],
+                      ret_entries[key]) for key in self.entry_keys),
+            comment))
+
+        self.feed_stats[ret_feed] += 1
+        for key, val in ret_entries.items():
+            self.entry_stats[key] += val
+
+        return ret_feed, ret_entries
+
+    def poll(self):
+        """ polls the active threads
+        """
+        if not self.tpool:
+            # no thread pool, nothing to poll
+            return
+        while True:
+            try:
+                time.sleep(0.2)
+                self.tpool.poll()
+            except KeyboardInterrupt:
+                prints('! Cancelled by user')
+                break
+            except threadpool.NoResultsPending:
+                prints(u'* DONE in %s\n* Feeds: %s\n* Entries: %s' % (
+                    unicode(datetime.datetime.now() - self.time_start),
+                    u' '.join(u'%s=%d' % (self.feed_trans[key],
+                              self.feed_stats[key])
+                              for key in self.feed_keys),
+                    u' '.join(u'%s=%d' % (self.entry_trans[key],
+                              self.entry_stats[key])
+                              for key in self.entry_keys)
+                    ))
+                break
+
+
+def main():
+    """ Main function. Nothing to see here. Move along.
+    """
+    parser = optparse.OptionParser(usage='%prog [options]',
+                                   version=USER_AGENT)
+    parser.add_option('--settings',
+      help='Python path to settings module. If this isn\'t provided, ' \
+           'the DJANGO_SETTINGS_MODULE enviroment variable will be used.')
+    parser.add_option('-f', '--feed', action='append', type='int',
+      help='A feed id to be updated. This option can be given multiple ' \
+           'times to update several feeds at the same time ' \
+           '(-f 1 -f 4 -f 7).')
+    parser.add_option('-s', '--site', type='int',
+      help='A site id to update.')
+    parser.add_option('-v', '--verbose', action='store_true',
+      dest='verbose', default=False, help='Verbose output.')
+    parser.add_option('-t', '--timeout', type='int', default=10,
+      help='Wait timeout in seconds when connecting to feeds.')
+    parser.add_option('-w', '--workerthreads', type='int', default=10,
+      help='Worker threads that will fetch feeds in parallel.')
+    options = parser.parse_args()[0]
+    if options.settings:
+        os.environ["DJANGO_SETTINGS_MODULE"] = options.settings
+
+
+    from calibre.www.apps.feedjack import models, fjcache
+
+    # settting socket timeout (default= 10 seconds)
+    socket.setdefaulttimeout(options.timeout)
+
+    # our job dispatcher
+    disp = Dispatcher(options, options.workerthreads)
+
+    prints('* BEGIN: %s' % (unicode(datetime.datetime.now()),))
+
+    if options.feed:
+        feeds = models.Feed.objects.filter(id__in=options.feed)
+        known_ids = []
+        for feed in feeds:
+            known_ids.append(feed.id)
+            disp.add_job(feed)
+        for feed in options.feed:
+            if feed not in known_ids:
+                prints('! Unknown feed id: %d' % (feed,))
+    elif options.site:
+        try:
+            site = models.Site.objects.get(pk=int(options.site))
+        except models.Site.DoesNotExist:
+            site = None
+            prints('! Unknown site id: %d' % (options.site,))
+        if site:
+            feeds = [sub.feed for sub in site.subscriber_set.all()]
+            for feed in feeds:
+                disp.add_job(feed)
+    else:
+        for feed in models.Feed.objects.filter(is_active=True):
+            disp.add_job(feed)
+
+    disp.poll()
+
+    # removing the cached data in all sites, this will only work with the
+    # memcached, db and file backends
+    [fjcache.cache_delsite(site.id) for site in models.Site.objects.all()]
+
+    if threadpool:
+        tcom = u'%d threads' % (options.workerthreads,)
+    else:
+        tcom = u'no threadpool module available, no parallel fetching'
+
+    prints('* END: %s (%s)' % (unicode(datetime.datetime.now()), tcom))
+
+if __name__ == '__main__':
+    main()
+
diff --git a/src/calibre/www/apps/feedjack/urls.py b/src/calibre/www/apps/feedjack/urls.py
new file mode 100644
index 0000000000..a732f88107
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/urls.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+urls.py
+"""
+
+from django.conf.urls.defaults import patterns
+from django.views.generic.simple import redirect_to
+
+from calibre.www.apps.feedjack import views
+
+
+
+urlpatterns = patterns('',
+    (r'^rss20.xml$', redirect_to,
+      {'url':'/feed/rss/'}),
+    (r'^feed/$', redirect_to,
+      {'url':'/feed/atom/'}),
+    (r'^feed/rss/$', views.rssfeed),
+    (r'^feed/atom/$', views.atomfeed),
+
+    (r'^feed/user/(?P<user>\d+)/tag/(?P<tag>.*)/$', redirect_to,
+      {'url':'/feed/atom/user/%(user)s/tag/%(tag)s/'}),
+    (r'^feed/user/(?P<user>\d+)/$', redirect_to,
+      {'url':'/feed/atom/user/%(user)s/'}),
+    (r'^feed/tag/(?P<tag>.*)/$', redirect_to,
+      {'url':'/feed/atom/tag/%(tag)s/'}),
+
+    (r'^feed/atom/user/(?P<user>\d+)/tag/(?P<tag>.*)/$', views.atomfeed),
+    (r'^feed/atom/user/(?P<user>\d+)/$', views.atomfeed),
+    (r'^feed/atom/tag/(?P<tag>.*)/$', views.atomfeed),
+    (r'^feed/rss/user/(?P<user>\d+)/tag/(?P<tag>.*)/$', views.rssfeed),
+    (r'^feed/rss/user/(?P<user>\d+)/$', views.rssfeed),
+    (r'^feed/rss/tag/(?P<tag>.*)/$', views.rssfeed),
+
+    (r'^user/(?P<user>\d+)/tag/(?P<tag>.*)/$', views.mainview),
+    (r'^user/(?P<user>\d+)/$', views.mainview),
+    (r'^tag/(?P<tag>.*)/$', views.mainview),
+
+    (r'^opml/$', views.opml),
+    (r'^foaf/$', views.foaf),
+    (r'^$', views.mainview),
+)
+
+#~
diff --git a/src/calibre/www/apps/feedjack/views.py b/src/calibre/www/apps/feedjack/views.py
new file mode 100644
index 0000000000..c1f31eb908
--- /dev/null
+++ b/src/calibre/www/apps/feedjack/views.py
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+
+"""
+feedjack
+Gustavo Picón
+views.py
+"""
+
+
+from django.utils import feedgenerator
+from django.shortcuts import render_to_response
+from django.http import HttpResponse
+from django.utils.cache import patch_vary_headers
+from django.template import RequestContext, loader
+
+from calibre.www.apps.feedjack import models, fjlib, fjcache
+
+def initview(request):
+    """ Retrieves the basic data needed by all feeds (host, feeds, etc)
+
+    Returns a tuple of:
+    1. A valid cached response or None
+    2. The current site object
+    3. The cache key
+    4. The subscribers for the site (objects)
+    5. The feeds for the site (ids)
+    """
+
+    site_id, cachekey = fjlib.getcurrentsite(request.META['HTTP_HOST'], \
+      request.META.get('REQUEST_URI', request.META.get('PATH_INFO', '/')), \
+      request.META['QUERY_STRING'])
+    response = fjcache.cache_get(site_id, cachekey)
+    if response:
+        return response, None, cachekey, [], []
+
+    site = models.Site.objects.get(pk=site_id)
+    sfeeds_obj = fjlib.sitefeeds(site)
+    sfeeds_ids = [subscriber.feed.id for subscriber in sfeeds_obj]
+
+    return None, site, cachekey, sfeeds_obj, sfeeds_ids
+
+def blogroll(request, btype):
+    """ View that handles the generation of blogrolls.
+    """
+
+    response, site, cachekey, sfeeds_obj, sfeeds_ids = initview(request)
+    if response:
+        return response
+
+    # for some reason this isn't working:
+    #
+    #response = render_to_response('feedjack/%s.xml' % btype, \
+    #  fjlib.get_extra_content(site, sfeeds_ids))
+    #response.mimetype = 'text/xml; charset=utf-8'
+    #
+    # so we must use this:
+
+    template = loader.get_template('feedjack/%s.xml' % btype)
+    ctx = {}
+    fjlib.get_extra_content(site, sfeeds_ids, ctx)
+    ctx = RequestContext(request, ctx)
+    response = HttpResponse(template.render(ctx) , \
+      mimetype='text/xml; charset=utf-8')
+
+
+    patch_vary_headers(response, ['Host'])
+    fjcache.cache_set(site, cachekey, response)
+    return response
+
+def foaf(request):
+    """ View that handles the generation of the FOAF blogroll.
+    """
+
+    return blogroll(request, 'foaf')
+
+def opml(request):
+    """ View that handles the generation of the OPML blogroll.
+    """
+
+    return blogroll(request, 'opml')
+
+
+def buildfeed(request, feedclass, tag=None, user=None):
+    """ View that handles the feeds.
+    """
+
+    response, site, cachekey, sfeeds_obj, sfeeds_ids = initview(request)
+    if response:
+        return response
+
+    object_list = fjlib.get_paginator(site, sfeeds_ids, page=0, tag=tag, \
+      user=user)[1]
+
+    feed = feedclass(\
+        title=site.title,
+        link=site.url,
+        description=site.description,
+        feed_url='%s/%s' % (site.url, '/feed/rss/'))
+    for post in object_list:
+        feed.add_item( \
+          title = '%s: %s' % (post.feed.name, post.title), \
+          link = post.link, \
+          description = post.content, \
+          author_email = post.author_email, \
+          author_name = post.author, \
+          pubdate = post.date_modified, \
+          unique_id = post.link, \
+          categories = [tag.name for tag in post.tags.all()])
+    response = HttpResponse(mimetype=feed.mime_type)
+
+    # per host caching
+    patch_vary_headers(response, ['Host'])
+
+    feed.write(response, 'utf-8')
+    if site.use_internal_cache:
+        fjcache.cache_set(site, cachekey, response)
+    return response
+
+def rssfeed(request, tag=None, user=None):
+    """ Generates the RSS2 feed.
+    """
+    return buildfeed(request, feedgenerator.Rss201rev2Feed, tag, user)
+
+def atomfeed(request, tag=None, user=None):
+    """ Generates the Atom 1.0 feed.
+    """
+    return buildfeed(request, feedgenerator.Atom1Feed, tag, user)
+
+def mainview(request, tag=None, user=None):
+    """ View that handles all page requests.
+    """
+
+    response, site, cachekey, sfeeds_obj, sfeeds_ids = initview(request)
+    if response:
+        return response
+
+    ctx = fjlib.page_context(request, site, tag, user, (sfeeds_obj, \
+      sfeeds_ids))
+
+    response = render_to_response('feedjack/%s/post_list.html' % \
+      (site.template), ctx, context_instance=RequestContext(request))
+
+    # per host caching, in case the cache middleware is enabled
+    patch_vary_headers(response, ['Host'])
+
+    if site.use_internal_cache:
+        fjcache.cache_set(site, cachekey, response)
+    return response
+
+#~
+
diff --git a/src/calibre/www/apps/inlines/CHANGELOG.yml b/src/calibre/www/apps/inlines/CHANGELOG.yml
new file mode 100644
index 0000000000..afd75c7a3b
--- /dev/null
+++ b/src/calibre/www/apps/inlines/CHANGELOG.yml
@@ -0,0 +1,10 @@
+changes:
+  date: 2008-05-18
+    change: Converted everything to 4 space tabs and made a few other changes to comply with Python Style Guide.
+    
+  date: 2008-04-23
+    change: Added a mode called InlineType and a template tag that returns this models objects. 
+      
+  date: 2008-04-22
+    change: Added an 'extract_inlines' filter so you can loop over a list of inlines in a body of text.
+    change: Creating new inlines app.
\ No newline at end of file
diff --git a/src/calibre/www/apps/inlines/README.txt b/src/calibre/www/apps/inlines/README.txt
new file mode 100644
index 0000000000..649ef25f75
--- /dev/null
+++ b/src/calibre/www/apps/inlines/README.txt
@@ -0,0 +1,27 @@
+==============================================
+Django Basic Inlines
+http://code.google.com/p/django-basic-apps/
+==============================================
+
+A simple book library application for Django projects.
+
+To install this app, simply create a folder somewhere in
+your PYTHONPATH named 'basic' and place the 'inlines'
+app inside. Then add 'basic.inlines' to your projects
+INSTALLED_APPS list in your settings.py file.
+
+Inlines is a template filter that can be used in
+conjunction with inline markup to insert content objects
+into other pieces of content. An example would be inserting
+a photo into a blog post body. 
+
+An example of the markup is:
+  <inline type="media.photo" id="1" />
+
+The type attribute is app_name.model_name and the id is
+the object id. Pretty simple. 
+
+In your template you would say:
+  {% load inlines %}
+  
+  {{ post.body|render_inlines }}
\ No newline at end of file
diff --git a/src/calibre/www/apps/inlines/__init__.py b/src/calibre/www/apps/inlines/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/www/apps/inlines/admin.py b/src/calibre/www/apps/inlines/admin.py
new file mode 100644
index 0000000000..35bf096e50
--- /dev/null
+++ b/src/calibre/www/apps/inlines/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+from calibre.www.apps.inlines.models import *
+
+
+admin.site.register(InlineType)
\ No newline at end of file
diff --git a/src/calibre/www/apps/inlines/models.py b/src/calibre/www/apps/inlines/models.py
new file mode 100644
index 0000000000..e5308f2919
--- /dev/null
+++ b/src/calibre/www/apps/inlines/models.py
@@ -0,0 +1,17 @@
+from django.db import models
+from django.contrib.contenttypes.models import ContentType
+
+
+class InlineType(models.Model):
+    """ InlineType model """
+    title           = models.CharField(max_length=200)
+    content_type    = models.ForeignKey(ContentType)
+
+    class Meta:
+        db_table = 'inline_types'
+
+    class Admin:
+        pass
+
+    def __unicode__(self):
+        return self.title
\ No newline at end of file
diff --git a/src/calibre/www/apps/inlines/parser.py b/src/calibre/www/apps/inlines/parser.py
new file mode 100644
index 0000000000..bf2e959a61
--- /dev/null
+++ b/src/calibre/www/apps/inlines/parser.py
@@ -0,0 +1,92 @@
+from django.template import TemplateSyntaxError
+from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
+from django.http import Http404
+from django.utils.encoding import smart_unicode
+from django.template.loader import render_to_string
+from django.utils.safestring import mark_safe
+
+
+def inlines(value, return_list=False):
+    try:
+        from BeautifulSoup import BeautifulStoneSoup
+    except ImportError:
+        from beautifulsoup import BeautifulStoneSoup
+
+    content = BeautifulStoneSoup(value, selfClosingTags=['inline','img','br','input','meta','link','hr'])
+    inline_list = []
+
+    if return_list:
+        for inline in content.findAll('inline'):
+            rendered_inline = render_inline(inline)
+            inline_list.append(rendered_inline['context'])
+        return inline_list
+    else:
+        for inline in content.findAll('inline'):
+            rendered_inline = render_inline(inline)
+            inline.replaceWith(render_to_string(rendered_inline['template'], rendered_inline['context']))
+        return mark_safe(content)
+
+
+def render_inline(inline):
+    """
+    Replace inline markup with template markup that matches the
+    appropriate app and model.
+
+    """
+
+    # Look for inline type, 'app.model'
+    try:
+        app_label, model_name = inline['type'].split('.')
+    except:
+        if settings.DEBUG:
+            raise TemplateSyntaxError, "Couldn't find the attribute 'type' in the <inline> tag."
+        else:
+            return ''
+
+    # Look for content type
+    try:
+        content_type = ContentType.objects.get(app_label=app_label, model=model_name)
+        model = content_type.model_class()
+    except ContentType.DoesNotExist:
+        if settings.DEBUG:
+            raise TemplateSyntaxError, "Inline ContentType not found."
+        else:
+            return ''
+
+    # Check for an inline class attribute
+    try:
+        inline_class = smart_unicode(inline['class'])
+    except:
+        inline_class = ''
+
+    try:
+        try:
+            id_list = [int(i) for i in inline['ids'].split(',')]
+            obj_list = model.objects.in_bulk(id_list)
+            obj_list = list(obj_list[int(i)] for i in id_list)
+            context = { 'object_list': obj_list, 'class': inline_class }
+        except ValueError:
+            if settings.DEBUG:
+                raise ValueError, "The <inline> ids attribute is missing or invalid."
+            else:
+                return ''
+    except KeyError:
+        try:
+            obj = model.objects.get(pk=inline['id'])
+            context = { 'content_type':"%s.%s" % (app_label, model_name), 'object': obj, 'class': inline_class, 'settings': settings }
+        except model.DoesNotExist:
+            if settings.DEBUG:
+                raise model.DoesNotExist, "Object matching '%s' does not exist"
+            else:
+                return ''
+        except:
+            if settings.DEBUG:
+                raise TemplateSyntaxError, "The <inline> id attribute is missing or invalid."
+            else:
+                return ''
+
+    template = ["inlines/%s_%s.html" % (app_label, model_name), "inlines/default.html"]
+    rendered_inline = {'template':template, 'context':context}
+
+    return rendered_inline
\ No newline at end of file
diff --git a/src/calibre/www/apps/inlines/templatetags/__init__.py b/src/calibre/www/apps/inlines/templatetags/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/www/apps/inlines/templatetags/inlines.py b/src/calibre/www/apps/inlines/templatetags/inlines.py
new file mode 100644
index 0000000000..33a3196901
--- /dev/null
+++ b/src/calibre/www/apps/inlines/templatetags/inlines.py
@@ -0,0 +1,81 @@
+from django import template
+from calibre.www.apps.inlines.parser import inlines
+from calibre.www.apps.inlines.models import InlineType
+import re
+
+register = template.Library()
+
+
+@register.filter
+def render_inlines(value):
+    """
+    Renders inlines in a ``Post`` by passing them through inline templates.
+
+    Template Syntax::
+
+        {{ post.body|render_inlines|markdown:"safe" }}
+
+    Inline Syntax (singular)::
+
+        <inline type="<app_name>.<model_name>" id="<id>" class="med_left" />
+
+    Inline Syntax (plural)::
+
+        <inline type="<app_name>.<model_name>" ids="<id>, <id>, <id>" />
+
+    An inline template will be used to render the inline. Templates will be
+    locaed in the following maner:
+
+        ``inlines/<app_name>_<model_name>.html``
+
+    The template will be passed the following context:
+
+        ``object``
+            An object for the corresponding passed id.
+
+    or
+
+        ``object_list``
+            A list of objects for the corresponding ids.
+
+    It would be wise to anticipate both object_list and object unless
+    you know for sure one or the other will only be present.
+    """
+    return inlines(value)
+
+@register.filter
+def extract_inlines(value):
+    return inlines(value, True)
+
+
+class InlineTypes(template.Node):
+    def __init__(self, var_name):
+        self.var_name = var_name
+
+    def render(self, context):
+        types = InlineType.objects.all()
+        context[self.var_name] = types
+        return ''
+
+@register.tag(name='get_inline_types')
+def do_get_inline_types(parser, token):
+    """
+    Gets all inline types.
+
+    Syntax::
+
+        {% get_inline_types as [var_name] %}
+
+    Example usage::
+
+        {% get_inline_types as inline_list %}
+    """
+    try:
+        tag_name, arg = token.contents.split(None, 1)
+    except ValueError:
+        raise template.TemplateSyntaxError, "%s tag requires arguments" % token.contents.split()[0]
+    m = re.search(r'as (\w+)', arg)
+    if not m:
+        raise template.TemplateSyntaxError, "%s tag had invalid arguments" % tag_name
+    var_name = m.groups()[0]
+    return InlineTypes(var_name)
\ No newline at end of file
diff --git a/src/calibre/www/apps/tagging/__init__.py b/src/calibre/www/apps/tagging/__init__.py
new file mode 100644
index 0000000000..9cca99b771
--- /dev/null
+++ b/src/calibre/www/apps/tagging/__init__.py
@@ -0,0 +1,30 @@
+from django.utils.translation import ugettext as _
+
+from calibre.www.apps.tagging.managers import ModelTaggedItemManager, TagDescriptor
+
+VERSION = (0, 3, 'pre')
+
+class AlreadyRegistered(Exception):
+    """
+    An attempt was made to register a model more than once.
+    """
+    pass
+
+registry = []
+
+def register(model, tag_descriptor_attr='tags',
+             tagged_item_manager_attr='tagged'):
+    """
+    Sets the given model class up for working with tags.
+    """
+    if model in registry:
+        raise AlreadyRegistered(
+            _('The model %s has already been registered.') % model.__name__)
+    registry.append(model)
+
+    # Add tag descriptor
+    setattr(model, tag_descriptor_attr, TagDescriptor())
+
+    # Add custom manager
+    ModelTaggedItemManager().contribute_to_class(model,
+                                                 tagged_item_manager_attr)
diff --git a/src/calibre/www/apps/tagging/admin.py b/src/calibre/www/apps/tagging/admin.py
new file mode 100644
index 0000000000..51cb472e50
--- /dev/null
+++ b/src/calibre/www/apps/tagging/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+from calibre.www.apps.tagging.models import Tag, TaggedItem
+
+admin.site.register(TaggedItem)
+admin.site.register(Tag)
diff --git a/src/calibre/www/apps/tagging/fields.py b/src/calibre/www/apps/tagging/fields.py
new file mode 100644
index 0000000000..f6bb9fce15
--- /dev/null
+++ b/src/calibre/www/apps/tagging/fields.py
@@ -0,0 +1,107 @@
+"""
+A custom Model Field for tagging.
+"""
+from django.db.models import signals
+from django.db.models.fields import CharField
+from django.utils.translation import ugettext_lazy as _
+
+from calibre.www.apps.tagging import settings
+from calibre.www.apps.tagging.models import Tag
+from calibre.www.apps.tagging.utils import edit_string_for_tags
+
+class TagField(CharField):
+    """
+    A "special" character field that actually works as a relationship to tags
+    "under the hood". This exposes a space-separated string of tags, but does
+    the splitting/reordering/etc. under the hood.
+    """
+    def __init__(self, *args, **kwargs):
+        kwargs['max_length'] = kwargs.get('max_length', 255)
+        kwargs['blank'] = kwargs.get('blank', True)
+        super(TagField, self).__init__(*args, **kwargs)
+
+    def contribute_to_class(self, cls, name):
+        super(TagField, self).contribute_to_class(cls, name)
+
+        # Make this object the descriptor for field access.
+        setattr(cls, self.name, self)
+
+        # Save tags back to the database post-save
+        signals.post_save.connect(self._save, cls, True)
+
+    def __get__(self, instance, owner=None):
+        """
+        Tag getter. Returns an instance's tags if accessed on an instance, and
+        all of a model's tags if called on a class. That is, this model::
+
+           class Link(models.Model):
+               ...
+               tags = TagField()
+
+        Lets you do both of these::
+
+           >>> l = Link.objects.get(...)
+           >>> l.tags
+           'tag1 tag2 tag3'
+
+           >>> Link.tags
+           'tag1 tag2 tag3 tag4'
+
+        """
+        # Handle access on the model (i.e. Link.tags)
+        if instance is None:
+            return edit_string_for_tags(Tag.objects.usage_for_model(owner))
+
+        tags = self._get_instance_tag_cache(instance)
+        if tags is None:
+            if instance.pk is None:
+                self._set_instance_tag_cache(instance, '')
+            else:
+                self._set_instance_tag_cache(
+                    instance, edit_string_for_tags(Tag.objects.get_for_object(instance)))
+        return self._get_instance_tag_cache(instance)
+
+    def __set__(self, instance, value):
+        """
+        Set an object's tags.
+        """
+        if instance is None:
+            raise AttributeError(_('%s can only be set on instances.') % self.name)
+        if settings.FORCE_LOWERCASE_TAGS and value is not None:
+            value = value.lower()
+        self._set_instance_tag_cache(instance, value)
+
+    def _save(self, **kwargs): #signal, sender, instance):
+        """
+        Save tags back to the database
+        """
+        tags = self._get_instance_tag_cache(kwargs['instance'])
+        if tags is not None:
+            Tag.objects.update_tags(kwargs['instance'], tags)
+
+    def __delete__(self, instance):
+        """
+        Clear all of an object's tags.
+        """
+        self._set_instance_tag_cache(instance, '')
+
+    def _get_instance_tag_cache(self, instance):
+        """
+        Helper: get an instance's tag cache.
+        """
+        return getattr(instance, '_%s_cache' % self.attname, None)
+
+    def _set_instance_tag_cache(self, instance, tags):
+        """
+        Helper: set an instance's tag cache.
+        """
+        setattr(instance, '_%s_cache' % self.attname, tags)
+
+    def get_internal_type(self):
+        return 'CharField'
+
+    def formfield(self, **kwargs):
+        from calibre.www.apps.tagging import forms
+        defaults = {'form_class': forms.TagField}
+        defaults.update(kwargs)
+        return super(TagField, self).formfield(**defaults)
diff --git a/src/calibre/www/apps/tagging/forms.py b/src/calibre/www/apps/tagging/forms.py
new file mode 100644
index 0000000000..997ff5c66b
--- /dev/null
+++ b/src/calibre/www/apps/tagging/forms.py
@@ -0,0 +1,40 @@
+"""
+Tagging components for Django's form library.
+"""
+from django import forms
+from django.utils.translation import ugettext as _
+
+from calibre.www.apps.tagging import settings
+from calibre.www.apps.tagging.models import Tag
+from calibre.www.apps.tagging.utils import parse_tag_input
+
+class AdminTagForm(forms.ModelForm):
+    class Meta:
+        model = Tag
+
+    def clean_name(self):
+        value = self.cleaned_data['name']
+        tag_names = parse_tag_input(value)
+        if len(tag_names) > 1:
+            raise ValidationError(_('Multiple tags were given.'))
+        elif len(tag_names[0]) > settings.MAX_TAG_LENGTH:
+            raise forms.ValidationError(
+                _('A tag may be no more than %s characters long.') %
+                    settings.MAX_TAG_LENGTH)
+        return value
+
+class TagField(forms.CharField):
+    """
+    A ``CharField`` which validates that its input is a valid list of
+    tag names.
+    """
+    def clean(self, value):
+        value = super(TagField, self).clean(value)
+        if value == u'':
+            return value
+        for tag_name in parse_tag_input(value):
+            if len(tag_name) > settings.MAX_TAG_LENGTH:
+                raise forms.ValidationError(
+                    _('Each tag may be no more than %s characters long.') %
+                        settings.MAX_TAG_LENGTH)
+        return value
diff --git a/src/calibre/www/apps/tagging/generic.py b/src/calibre/www/apps/tagging/generic.py
new file mode 100644
index 0000000000..75d1b8e04e
--- /dev/null
+++ b/src/calibre/www/apps/tagging/generic.py
@@ -0,0 +1,40 @@
+from django.contrib.contenttypes.models import ContentType
+
+def fetch_content_objects(tagged_items, select_related_for=None):
+    """
+    Retrieves ``ContentType`` and content objects for the given list of
+    ``TaggedItems``, grouping the retrieval of content objects by model
+    type to reduce the number of queries executed.
+
+    This results in ``number_of_content_types + 1`` queries rather than
+    the ``number_of_tagged_items * 2`` queries you'd get by iterating
+    over the list and accessing each item's ``object`` attribute.
+
+    A ``select_related_for`` argument can be used to specify a list of
+    of model names (corresponding to the ``model`` field of a
+    ``ContentType``) for which ``select_related`` should be used when
+    retrieving model instances.
+    """
+    if select_related_for is None: select_related_for = []
+
+    # Group content object pks by their content type pks
+    objects = {}
+    for item in tagged_items:
+        objects.setdefault(item.content_type_id, []).append(item.object_id)
+
+    # Retrieve content types and content objects in bulk
+    content_types = ContentType._default_manager.in_bulk(objects.keys())
+    for content_type_pk, object_pks in objects.iteritems():
+        model = content_types[content_type_pk].model_class()
+        if content_types[content_type_pk].model in select_related_for:
+            objects[content_type_pk] = model._default_manager.select_related().in_bulk(object_pks)
+        else:
+            objects[content_type_pk] = model._default_manager.in_bulk(object_pks)
+
+    # Set content types and content objects in the appropriate cache
+    # attributes, so accessing the 'content_type' and 'object'
+    # attributes on each tagged item won't result in further database
+    # hits.
+    for item in tagged_items:
+        item._object_cache = objects[item.content_type_id][item.object_id]
+        item._content_type_cache = content_types[item.content_type_id]
diff --git a/src/calibre/www/apps/tagging/managers.py b/src/calibre/www/apps/tagging/managers.py
new file mode 100644
index 0000000000..b17269e146
--- /dev/null
+++ b/src/calibre/www/apps/tagging/managers.py
@@ -0,0 +1,68 @@
+"""
+Custom managers for Django models registered with the tagging
+application.
+"""
+from django.contrib.contenttypes.models import ContentType
+from django.db import models
+
+from calibre.www.apps.tagging.models import Tag, TaggedItem
+
+class ModelTagManager(models.Manager):
+    """
+    A manager for retrieving tags for a particular model.
+    """
+    def get_query_set(self):
+        ctype = ContentType.objects.get_for_model(self.model)
+        return Tag.objects.filter(
+            items__content_type__pk=ctype.pk).distinct()
+
+    def cloud(self, *args, **kwargs):
+        return Tag.objects.cloud_for_model(self.model, *args, **kwargs)
+
+    def related(self, tags, *args, **kwargs):
+        return Tag.objects.related_for_model(tags, self.model, *args, **kwargs)
+
+    def usage(self, *args, **kwargs):
+        return Tag.objects.usage_for_model(self.model, *args, **kwargs)
+
+class ModelTaggedItemManager(models.Manager):
+    """
+    A manager for retrieving model instances based on their tags.
+    """
+    def related_to(self, obj, queryset=None, num=None):
+        if queryset is None:
+            return TaggedItem.objects.get_related(obj, self.model, num=num)
+        else:
+            return TaggedItem.objects.get_related(obj, queryset, num=num)
+
+    def with_all(self, tags, queryset=None):
+        if queryset is None:
+            return TaggedItem.objects.get_by_model(self.model, tags)
+        else:
+            return TaggedItem.objects.get_by_model(queryset, tags)
+
+    def with_any(self, tags, queryset=None):
+        if queryset is None:
+            return TaggedItem.objects.get_union_by_model(self.model, tags)
+        else:
+            return TaggedItem.objects.get_union_by_model(queryset, tags)
+
+class TagDescriptor(object):
+    """
+    A descriptor which provides access to a ``ModelTagManager`` for
+    model classes and simple retrieval, updating and deletion of tags
+    for model instances.
+    """
+    def __get__(self, instance, owner):
+        if not instance:
+            tag_manager = ModelTagManager()
+            tag_manager.model = owner
+            return tag_manager
+        else:
+            return Tag.objects.get_for_object(instance)
+
+    def __set__(self, instance, value):
+        Tag.objects.update_tags(instance, value)
+
+    def __delete__(self, instance):
+        Tag.objects.update_tags(instance, None)
diff --git a/src/calibre/www/apps/tagging/models.py b/src/calibre/www/apps/tagging/models.py
new file mode 100644
index 0000000000..59fe7682c4
--- /dev/null
+++ b/src/calibre/www/apps/tagging/models.py
@@ -0,0 +1,480 @@
+"""
+Models and managers for generic tagging.
+"""
+# Python 2.3 compatibility
+try:
+    set
+except NameError:
+    from sets import Set as set
+
+from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.models import ContentType
+from django.db import connection, models
+from django.db.models.query import QuerySet
+from django.utils.translation import ugettext_lazy as _
+
+from calibre.www.apps.tagging import settings
+from calibre.www.apps.tagging.utils import calculate_cloud, get_tag_list, get_queryset_and_model, parse_tag_input
+from calibre.www.apps.tagging.utils import LOGARITHMIC
+
+qn = connection.ops.quote_name
+
+############
+# Managers #
+############
+
+class TagManager(models.Manager):
+    def update_tags(self, obj, tag_names):
+        """
+        Update tags associated with an object.
+        """
+        ctype = ContentType.objects.get_for_model(obj)
+        current_tags = list(self.filter(items__content_type__pk=ctype.pk,
+                                        items__object_id=obj.pk))
+        updated_tag_names = parse_tag_input(tag_names)
+        if settings.FORCE_LOWERCASE_TAGS:
+            updated_tag_names = [t.lower() for t in updated_tag_names]
+
+        # Remove tags which no longer apply
+        tags_for_removal = [tag for tag in current_tags \
+                            if tag.name not in updated_tag_names]
+        if len(tags_for_removal):
+            TaggedItem._default_manager.filter(content_type__pk=ctype.pk,
+                                               object_id=obj.pk,
+                                               tag__in=tags_for_removal).delete()
+        # Add new tags
+        current_tag_names = [tag.name for tag in current_tags]
+        for tag_name in updated_tag_names:
+            if tag_name not in current_tag_names:
+                tag, created = self.get_or_create(name=tag_name)
+                TaggedItem._default_manager.create(tag=tag, object=obj)
+
+    def add_tag(self, obj, tag_name):
+        """
+        Associates the given object with a tag.
+        """
+        tag_names = parse_tag_input(tag_name)
+        if not len(tag_names):
+            raise AttributeError(_('No tags were given: "%s".') % tag_name)
+        if len(tag_names) > 1:
+            raise AttributeError(_('Multiple tags were given: "%s".') % tag_name)
+        tag_name = tag_names[0]
+        if settings.FORCE_LOWERCASE_TAGS:
+            tag_name = tag_name.lower()
+        tag, created = self.get_or_create(name=tag_name)
+        ctype = ContentType.objects.get_for_model(obj)
+        TaggedItem._default_manager.get_or_create(
+            tag=tag, content_type=ctype, object_id=obj.pk)
+
+    def get_for_object(self, obj):
+        """
+        Create a queryset matching all tags associated with the given
+        object.
+        """
+        ctype = ContentType.objects.get_for_model(obj)
+        return self.filter(items__content_type__pk=ctype.pk,
+                           items__object_id=obj.pk)
+
+    def _get_usage(self, model, counts=False, min_count=None, extra_joins=None, extra_criteria=None, params=None):
+        """
+        Perform the custom SQL query for ``usage_for_model`` and
+        ``usage_for_queryset``.
+        """
+        if min_count is not None: counts = True
+
+        model_table = qn(model._meta.db_table)
+        model_pk = '%s.%s' % (model_table, qn(model._meta.pk.column))
+        query = """
+        SELECT DISTINCT %(tag)s.id, %(tag)s.name%(count_sql)s
+        FROM
+            %(tag)s
+            INNER JOIN %(tagged_item)s
+                ON %(tag)s.id = %(tagged_item)s.tag_id
+            INNER JOIN %(model)s
+                ON %(tagged_item)s.object_id = %(model_pk)s
+            %%s
+        WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
+            %%s
+        GROUP BY %(tag)s.id, %(tag)s.name
+        %%s
+        ORDER BY %(tag)s.name ASC""" % {
+            'tag': qn(self.model._meta.db_table),
+            'count_sql': counts and (', COUNT(%s)' % model_pk) or '',
+            'tagged_item': qn(TaggedItem._meta.db_table),
+            'model': model_table,
+            'model_pk': model_pk,
+            'content_type_id': ContentType.objects.get_for_model(model).pk,
+        }
+
+        min_count_sql = ''
+        if min_count is not None:
+            min_count_sql = 'HAVING COUNT(%s) >= %%s' % model_pk
+            params.append(min_count)
+
+        cursor = connection.cursor()
+        cursor.execute(query % (extra_joins, extra_criteria, min_count_sql), params)
+        tags = []
+        for row in cursor.fetchall():
+            t = self.model(*row[:2])
+            if counts:
+                t.count = row[2]
+            tags.append(t)
+        return tags
+
+    def usage_for_model(self, model, counts=False, min_count=None, filters=None):
+        """
+        Obtain a list of tags associated with instances of the given
+        Model class.
+
+        If ``counts`` is True, a ``count`` attribute will be added to
+        each tag, indicating how many times it has been used against
+        the Model class in question.
+
+        If ``min_count`` is given, only tags which have a ``count``
+        greater than or equal to ``min_count`` will be returned.
+        Passing a value for ``min_count`` implies ``counts=True``.
+
+        To limit the tags (and counts, if specified) returned to those
+        used by a subset of the Model's instances, pass a dictionary
+        of field lookups to be applied to the given Model as the
+        ``filters`` argument.
+        """
+        if filters is None: filters = {}
+
+        queryset = model._default_manager.filter()
+        for f in filters.items():
+            queryset.query.add_filter(f)
+        usage = self.usage_for_queryset(queryset, counts, min_count)
+
+        return usage
+
+    def usage_for_queryset(self, queryset, counts=False, min_count=None):
+        """
+        Obtain a list of tags associated with instances of a model
+        contained in the given queryset.
+
+        If ``counts`` is True, a ``count`` attribute will be added to
+        each tag, indicating how many times it has been used against
+        the Model class in question.
+
+        If ``min_count`` is given, only tags which have a ``count``
+        greater than or equal to ``min_count`` will be returned.
+        Passing a value for ``min_count`` implies ``counts=True``.
+        """
+
+        extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:])
+        where, params = queryset.query.where.as_sql()
+        if where:
+            extra_criteria = 'AND %s' % where
+        else:
+            extra_criteria = ''
+        return self._get_usage(queryset.model, counts, min_count, extra_joins, extra_criteria, params)
+
+    def related_for_model(self, tags, model, counts=False, min_count=None):
+        """
+        Obtain a list of tags related to a given list of tags - that
+        is, other tags used by items which have all the given tags.
+
+        If ``counts`` is True, a ``count`` attribute will be added to
+        each tag, indicating the number of items which have it in
+        addition to the given list of tags.
+
+        If ``min_count`` is given, only tags which have a ``count``
+        greater than or equal to ``min_count`` will be returned.
+        Passing a value for ``min_count`` implies ``counts=True``.
+        """
+        if min_count is not None: counts = True
+        tags = get_tag_list(tags)
+        tag_count = len(tags)
+        tagged_item_table = qn(TaggedItem._meta.db_table)
+        query = """
+        SELECT %(tag)s.id, %(tag)s.name%(count_sql)s
+        FROM %(tagged_item)s INNER JOIN %(tag)s ON %(tagged_item)s.tag_id = %(tag)s.id
+        WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
+          AND %(tagged_item)s.object_id IN
+          (
+              SELECT %(tagged_item)s.object_id
+              FROM %(tagged_item)s, %(tag)s
+              WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
+                AND %(tag)s.id = %(tagged_item)s.tag_id
+                AND %(tag)s.id IN (%(tag_id_placeholders)s)
+              GROUP BY %(tagged_item)s.object_id
+              HAVING COUNT(%(tagged_item)s.object_id) = %(tag_count)s
+          )
+          AND %(tag)s.id NOT IN (%(tag_id_placeholders)s)
+        GROUP BY %(tag)s.id, %(tag)s.name
+        %(min_count_sql)s
+        ORDER BY %(tag)s.name ASC""" % {
+            'tag': qn(self.model._meta.db_table),
+            'count_sql': counts and ', COUNT(%s.object_id)' % tagged_item_table or '',
+            'tagged_item': tagged_item_table,
+            'content_type_id': ContentType.objects.get_for_model(model).pk,
+            'tag_id_placeholders': ','.join(['%s'] * tag_count),
+            'tag_count': tag_count,
+            'min_count_sql': min_count is not None and ('HAVING COUNT(%s.object_id) >= %%s' % tagged_item_table) or '',
+        }
+
+        params = [tag.pk for tag in tags] * 2
+        if min_count is not None:
+            params.append(min_count)
+
+        cursor = connection.cursor()
+        cursor.execute(query, params)
+        related = []
+        for row in cursor.fetchall():
+            tag = self.model(*row[:2])
+            if counts is True:
+                tag.count = row[2]
+            related.append(tag)
+        return related
+
+    def cloud_for_model(self, model, steps=4, distribution=LOGARITHMIC,
+                        filters=None, min_count=None):
+        """
+        Obtain a list of tags associated with instances of the given
+        Model, giving each tag a ``count`` attribute indicating how
+        many times it has been used and a ``font_size`` attribute for
+        use in displaying a tag cloud.
+
+        ``steps`` defines the range of font sizes - ``font_size`` will
+        be an integer between 1 and ``steps`` (inclusive).
+
+        ``distribution`` defines the type of font size distribution
+        algorithm which will be used - logarithmic or linear. It must
+        be either ``tagging.utils.LOGARITHMIC`` or
+        ``tagging.utils.LINEAR``.
+
+        To limit the tags displayed in the cloud to those associated
+        with a subset of the Model's instances, pass a dictionary of
+        field lookups to be applied to the given Model as the
+        ``filters`` argument.
+
+        To limit the tags displayed in the cloud to those with a
+        ``count`` greater than or equal to ``min_count``, pass a value
+        for the ``min_count`` argument.
+        """
+        tags = list(self.usage_for_model(model, counts=True, filters=filters,
+                                         min_count=min_count))
+        return calculate_cloud(tags, steps, distribution)
+
+class TaggedItemManager(models.Manager):
+    """
+    FIXME There's currently no way to get the ``GROUP BY`` and ``HAVING``
+          SQL clauses required by many of this manager's methods into
+          Django's ORM.
+
+          For now, we manually execute a query to retrieve the PKs of
+          objects we're interested in, then use the ORM's ``__in``
+          lookup to return a ``QuerySet``.
+
+          Now that the queryset-refactor branch is in the trunk, this can be
+          tidied up significantly.
+    """
+    def get_by_model(self, queryset_or_model, tags):
+        """
+        Create a ``QuerySet`` containing instances of the specified
+        model associated with a given tag or list of tags.
+        """
+        tags = get_tag_list(tags)
+        tag_count = len(tags)
+        if tag_count == 0:
+            # No existing tags were given
+            queryset, model = get_queryset_and_model(queryset_or_model)
+            return model._default_manager.none()
+        elif tag_count == 1:
+            # Optimisation for single tag - fall through to the simpler
+            # query below.
+            tag = tags[0]
+        else:
+            return self.get_intersection_by_model(queryset_or_model, tags)
+
+        queryset, model = get_queryset_and_model(queryset_or_model)
+        content_type = ContentType.objects.get_for_model(model)
+        opts = self.model._meta
+        tagged_item_table = qn(opts.db_table)
+        return queryset.extra(
+            tables=[opts.db_table],
+            where=[
+                '%s.content_type_id = %%s' % tagged_item_table,
+                '%s.tag_id = %%s' % tagged_item_table,
+                '%s.%s = %s.object_id' % (qn(model._meta.db_table),
+                                          qn(model._meta.pk.column),
+                                          tagged_item_table)
+            ],
+            params=[content_type.pk, tag.pk],
+        )
+
+    def get_intersection_by_model(self, queryset_or_model, tags):
+        """
+        Create a ``QuerySet`` containing instances of the specified
+        model associated with *all* of the given list of tags.
+        """
+        tags = get_tag_list(tags)
+        tag_count = len(tags)
+        queryset, model = get_queryset_and_model(queryset_or_model)
+
+        if not tag_count:
+            return model._default_manager.none()
+
+        model_table = qn(model._meta.db_table)
+        # This query selects the ids of all objects which have all the
+        # given tags.
+        query = """
+        SELECT %(model_pk)s
+        FROM %(model)s, %(tagged_item)s
+        WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
+          AND %(tagged_item)s.tag_id IN (%(tag_id_placeholders)s)
+          AND %(model_pk)s = %(tagged_item)s.object_id
+        GROUP BY %(model_pk)s
+        HAVING COUNT(%(model_pk)s) = %(tag_count)s""" % {
+            'model_pk': '%s.%s' % (model_table, qn(model._meta.pk.column)),
+            'model': model_table,
+            'tagged_item': qn(self.model._meta.db_table),
+            'content_type_id': ContentType.objects.get_for_model(model).pk,
+            'tag_id_placeholders': ','.join(['%s'] * tag_count),
+            'tag_count': tag_count,
+        }
+
+        cursor = connection.cursor()
+        cursor.execute(query, [tag.pk for tag in tags])
+        object_ids = [row[0] for row in cursor.fetchall()]
+        if len(object_ids) > 0:
+            return queryset.filter(pk__in=object_ids)
+        else:
+            return model._default_manager.none()
+
+    def get_union_by_model(self, queryset_or_model, tags):
+        """
+        Create a ``QuerySet`` containing instances of the specified
+        model associated with *any* of the given list of tags.
+        """
+        tags = get_tag_list(tags)
+        tag_count = len(tags)
+        queryset, model = get_queryset_and_model(queryset_or_model)
+
+        if not tag_count:
+            return model._default_manager.none()
+
+        model_table = qn(model._meta.db_table)
+        # This query selects the ids of all objects which have any of
+        # the given tags.
+        query = """
+        SELECT %(model_pk)s
+        FROM %(model)s, %(tagged_item)s
+        WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
+          AND %(tagged_item)s.tag_id IN (%(tag_id_placeholders)s)
+          AND %(model_pk)s = %(tagged_item)s.object_id
+        GROUP BY %(model_pk)s""" % {
+            'model_pk': '%s.%s' % (model_table, qn(model._meta.pk.column)),
+            'model': model_table,
+            'tagged_item': qn(self.model._meta.db_table),
+            'content_type_id': ContentType.objects.get_for_model(model).pk,
+            'tag_id_placeholders': ','.join(['%s'] * tag_count),
+        }
+
+        cursor = connection.cursor()
+        cursor.execute(query, [tag.pk for tag in tags])
+        object_ids = [row[0] for row in cursor.fetchall()]
+        if len(object_ids) > 0:
+            return queryset.filter(pk__in=object_ids)
+        else:
+            return model._default_manager.none()
+
+    def get_related(self, obj, queryset_or_model, num=None):
+        """
+        Retrieve a list of instances of the specified model which share
+        tags with the model instance ``obj``, ordered by the number of
+        shared tags in descending order.
+
+        If ``num`` is given, a maximum of ``num`` instances will be
+        returned.
+        """
+        queryset, model = get_queryset_and_model(queryset_or_model)
+        model_table = qn(model._meta.db_table)
+        content_type = ContentType.objects.get_for_model(obj)
+        related_content_type = ContentType.objects.get_for_model(model)
+        query = """
+        SELECT %(model_pk)s, COUNT(related_tagged_item.object_id) AS %(count)s
+        FROM %(model)s, %(tagged_item)s, %(tag)s, %(tagged_item)s related_tagged_item
+        WHERE %(tagged_item)s.object_id = %%s
+          AND %(tagged_item)s.content_type_id = %(content_type_id)s
+          AND %(tag)s.id = %(tagged_item)s.tag_id
+          AND related_tagged_item.content_type_id = %(related_content_type_id)s
+          AND related_tagged_item.tag_id = %(tagged_item)s.tag_id
+          AND %(model_pk)s = related_tagged_item.object_id"""
+        if content_type.pk == related_content_type.pk:
+            # Exclude the given instance itself if determining related
+            # instances for the same model.
+            query += """
+          AND related_tagged_item.object_id != %(tagged_item)s.object_id"""
+        query += """
+        GROUP BY %(model_pk)s
+        ORDER BY %(count)s DESC
+        %(limit_offset)s"""
+        query = query % {
+            'model_pk': '%s.%s' % (model_table, qn(model._meta.pk.column)),
+            'count': qn('count'),
+            'model': model_table,
+            'tagged_item': qn(self.model._meta.db_table),
+            'tag': qn(self.model._meta.get_field('tag').rel.to._meta.db_table),
+            'content_type_id': content_type.pk,
+            'related_content_type_id': related_content_type.pk,
+            # Hardcoding this for now just to get tests working again - this
+            # should now be handled by the query object.
+            'limit_offset': num is not None and 'LIMIT %s' or '',
+        }
+
+        cursor = connection.cursor()
+        params = [obj.pk]
+        if num is not None:
+            params.append(num)
+        cursor.execute(query, params)
+        object_ids = [row[0] for row in cursor.fetchall()]
+        if len(object_ids) > 0:
+            # Use in_bulk here instead of an id__in lookup, because id__in would
+            # clobber the ordering.
+            object_dict = queryset.in_bulk(object_ids)
+            return [object_dict[object_id] for object_id in object_ids \
+                    if object_id in object_dict]
+        else:
+            return []
+
+##########
+# Models #
+##########
+
+class Tag(models.Model):
+    """
+    A tag.
+    """
+    name = models.CharField(_('name'), max_length=50, unique=True, db_index=True)
+
+    objects = TagManager()
+
+    class Meta:
+        ordering = ('name',)
+        verbose_name = _('tag')
+        verbose_name_plural = _('tags')
+
+    def __unicode__(self):
+        return self.name
+
+class TaggedItem(models.Model):
+    """
+    Holds the relationship between a tag and the item being tagged.
+    """
+    tag          = models.ForeignKey(Tag, verbose_name=_('tag'), related_name='items')
+    content_type = models.ForeignKey(ContentType, verbose_name=_('content type'))
+    object_id    = models.PositiveIntegerField(_('object id'), db_index=True)
+    object       = generic.GenericForeignKey('content_type', 'object_id')
+
+    objects = TaggedItemManager()
+
+    class Meta:
+        # Enforce unique tag association per object
+        unique_together = (('tag', 'content_type', 'object_id'),)
+        verbose_name = _('tagged item')
+        verbose_name_plural = _('tagged items')
+
+    def __unicode__(self):
+        return u'%s [%s]' % (self.object, self.tag)
diff --git a/src/calibre/www/apps/tagging/settings.py b/src/calibre/www/apps/tagging/settings.py
new file mode 100644
index 0000000000..1d6224cd5d
--- /dev/null
+++ b/src/calibre/www/apps/tagging/settings.py
@@ -0,0 +1,13 @@
+"""
+Convenience module for access of custom tagging application settings,
+which enforces default settings when the main settings module does not
+contain the appropriate settings.
+"""
+from django.conf import settings
+
+# The maximum length of a tag's name.
+MAX_TAG_LENGTH = getattr(settings, 'MAX_TAG_LENGTH', 50)
+
+# Whether to force all tags to lowercase before they are saved to the
+# database.
+FORCE_LOWERCASE_TAGS = getattr(settings, 'FORCE_LOWERCASE_TAGS', False)
diff --git a/src/calibre/www/apps/tagging/templatetags/__init__.py b/src/calibre/www/apps/tagging/templatetags/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/www/apps/tagging/templatetags/tagging_tags.py b/src/calibre/www/apps/tagging/templatetags/tagging_tags.py
new file mode 100644
index 0000000000..11d31ccb4f
--- /dev/null
+++ b/src/calibre/www/apps/tagging/templatetags/tagging_tags.py
@@ -0,0 +1,231 @@
+from django.db.models import get_model
+from django.template import Library, Node, TemplateSyntaxError, Variable, resolve_variable
+from django.utils.translation import ugettext as _
+
+from tagging.models import Tag, TaggedItem
+from tagging.utils import LINEAR, LOGARITHMIC
+
+register = Library()
+
+class TagsForModelNode(Node):
+    def __init__(self, model, context_var, counts):
+        self.model = model
+        self.context_var = context_var
+        self.counts = counts
+
+    def render(self, context):
+        model = get_model(*self.model.split('.'))
+        if model is None:
+            raise TemplateSyntaxError(_('tags_for_model tag was given an invalid model: %s') % self.model)
+        context[self.context_var] = Tag.objects.usage_for_model(model, counts=self.counts)
+        return ''
+
+class TagCloudForModelNode(Node):
+    def __init__(self, model, context_var, **kwargs):
+        self.model = model
+        self.context_var = context_var
+        self.kwargs = kwargs
+
+    def render(self, context):
+        model = get_model(*self.model.split('.'))
+        if model is None:
+            raise TemplateSyntaxError(_('tag_cloud_for_model tag was given an invalid model: %s') % self.model)
+        context[self.context_var] = \
+            Tag.objects.cloud_for_model(model, **self.kwargs)
+        return ''
+
+class TagsForObjectNode(Node):
+    def __init__(self, obj, context_var):
+        self.obj = Variable(obj)
+        self.context_var = context_var
+
+    def render(self, context):
+        context[self.context_var] = \
+            Tag.objects.get_for_object(self.obj.resolve(context))
+        return ''
+
+class TaggedObjectsNode(Node):
+    def __init__(self, tag, model, context_var):
+        self.tag = Variable(tag)
+        self.context_var = context_var
+        self.model = model
+
+    def render(self, context):
+        model = get_model(*self.model.split('.'))
+        if model is None:
+            raise TemplateSyntaxError(_('tagged_objects tag was given an invalid model: %s') % self.model)
+        context[self.context_var] = \
+            TaggedItem.objects.get_by_model(model, self.tag.resolve(context))
+        return ''
+
+def do_tags_for_model(parser, token):
+    """
+    Retrieves a list of ``Tag`` objects associated with a given model
+    and stores them in a context variable.
+
+    Usage::
+
+       {% tags_for_model [model] as [varname] %}
+
+    The model is specified in ``[appname].[modelname]`` format.
+
+    Extended usage::
+
+       {% tags_for_model [model] as [varname] with counts %}
+
+    If specified - by providing extra ``with counts`` arguments - adds
+    a ``count`` attribute to each tag containing the number of
+    instances of the given model which have been tagged with it.
+
+    Examples::
+
+       {% tags_for_model products.Widget as widget_tags %}
+       {% tags_for_model products.Widget as widget_tags with counts %}
+
+    """
+    bits = token.contents.split()
+    len_bits = len(bits)
+    if len_bits not in (4, 6):
+        raise TemplateSyntaxError(_('%s tag requires either three or five arguments') % bits[0])
+    if bits[2] != 'as':
+        raise TemplateSyntaxError(_("second argument to %s tag must be 'as'") % bits[0])
+    if len_bits == 6:
+        if bits[4] != 'with':
+            raise TemplateSyntaxError(_("if given, fourth argument to %s tag must be 'with'") % bits[0])
+        if bits[5] != 'counts':
+            raise TemplateSyntaxError(_("if given, fifth argument to %s tag must be 'counts'") % bits[0])
+    if len_bits == 4:
+        return TagsForModelNode(bits[1], bits[3], counts=False)
+    else:
+        return TagsForModelNode(bits[1], bits[3], counts=True)
+
+def do_tag_cloud_for_model(parser, token):
+    """
+    Retrieves a list of ``Tag`` objects for a given model, with tag
+    cloud attributes set, and stores them in a context variable.
+
+    Usage::
+
+       {% tag_cloud_for_model [model] as [varname] %}
+
+    The model is specified in ``[appname].[modelname]`` format.
+
+    Extended usage::
+
+       {% tag_cloud_for_model [model] as [varname] with [options] %}
+
+    Extra options can be provided after an optional ``with`` argument,
+    with each option being specified in ``[name]=[value]`` format. Valid
+    extra options are:
+
+       ``steps``
+          Integer. Defines the range of font sizes.
+
+       ``min_count``
+          Integer. Defines the minimum number of times a tag must have
+          been used to appear in the cloud.
+
+       ``distribution``
+          One of ``linear`` or ``log``. Defines the font-size
+          distribution algorithm to use when generating the tag cloud.
+
+    Examples::
+
+       {% tag_cloud_for_model products.Widget as widget_tags %}
+       {% tag_cloud_for_model products.Widget as widget_tags with steps=9 min_count=3 distribution=log %}
+
+    """
+    bits = token.contents.split()
+    len_bits = len(bits)
+    if len_bits != 4 and len_bits not in range(6, 9):
+        raise TemplateSyntaxError(_('%s tag requires either three or between five and seven arguments') % bits[0])
+    if bits[2] != 'as':
+        raise TemplateSyntaxError(_("second argument to %s tag must be 'as'") % bits[0])
+    kwargs = {}
+    if len_bits > 5:
+        if bits[4] != 'with':
+            raise TemplateSyntaxError(_("if given, fourth argument to %s tag must be 'with'") % bits[0])
+        for i in range(5, len_bits):
+            try:
+                name, value = bits[i].split('=')
+                if name == 'steps' or name == 'min_count':
+                    try:
+                        kwargs[str(name)] = int(value)
+                    except ValueError:
+                        raise TemplateSyntaxError(_("%(tag)s tag's '%(option)s' option was not a valid integer: '%(value)s'") % {
+                            'tag': bits[0],
+                            'option': name,
+                            'value': value,
+                        })
+                elif name == 'distribution':
+                    if value in ['linear', 'log']:
+                        kwargs[str(name)] = {'linear': LINEAR, 'log': LOGARITHMIC}[value]
+                    else:
+                        raise TemplateSyntaxError(_("%(tag)s tag's '%(option)s' option was not a valid choice: '%(value)s'") % {
+                            'tag': bits[0],
+                            'option': name,
+                            'value': value,
+                        })
+                else:
+                    raise TemplateSyntaxError(_("%(tag)s tag was given an invalid option: '%(option)s'") % {
+                        'tag': bits[0],
+                        'option': name,
+                    })
+            except ValueError:
+                raise TemplateSyntaxError(_("%(tag)s tag was given a badly formatted option: '%(option)s'") % {
+                    'tag': bits[0],
+                    'option': bits[i],
+                })
+    return TagCloudForModelNode(bits[1], bits[3], **kwargs)
+
+def do_tags_for_object(parser, token):
+    """
+    Retrieves a list of ``Tag`` objects associated with an object and
+    stores them in a context variable.
+
+    Usage::
+
+       {% tags_for_object [object] as [varname] %}
+
+    Example::
+
+        {% tags_for_object foo_object as tag_list %}
+    """
+    bits = token.contents.split()
+    if len(bits) != 4:
+        raise TemplateSyntaxError(_('%s tag requires exactly three arguments') % bits[0])
+    if bits[2] != 'as':
+        raise TemplateSyntaxError(_("second argument to %s tag must be 'as'") % bits[0])
+    return TagsForObjectNode(bits[1], bits[3])
+
+def do_tagged_objects(parser, token):
+    """
+    Retrieves a list of instances of a given model which are tagged with
+    a given ``Tag`` and stores them in a context variable.
+
+    Usage::
+
+       {% tagged_objects [tag] in [model] as [varname] %}
+
+    The model is specified in ``[appname].[modelname]`` format.
+
+    The tag must be an instance of a ``Tag``, not the name of a tag.
+
+    Example::
+
+        {% tagged_objects comedy_tag in tv.Show as comedies %}
+
+    """
+    bits = token.contents.split()
+    if len(bits) != 6:
+        raise TemplateSyntaxError(_('%s tag requires exactly five arguments') % bits[0])
+    if bits[2] != 'in':
+        raise TemplateSyntaxError(_("second argument to %s tag must be 'in'") % bits[0])
+    if bits[4] != 'as':
+        raise TemplateSyntaxError(_("fourth argument to %s tag must be 'as'") % bits[0])
+    return TaggedObjectsNode(bits[1], bits[3], bits[5])
+
+register.tag('tags_for_model', do_tags_for_model)
+register.tag('tag_cloud_for_model', do_tag_cloud_for_model)
+register.tag('tags_for_object', do_tags_for_object)
+register.tag('tagged_objects', do_tagged_objects)
diff --git a/src/calibre/www/apps/tagging/utils.py b/src/calibre/www/apps/tagging/utils.py
new file mode 100644
index 0000000000..5750c7a0f7
--- /dev/null
+++ b/src/calibre/www/apps/tagging/utils.py
@@ -0,0 +1,263 @@
+"""
+Tagging utilities - from user tag input parsing to tag cloud
+calculation.
+"""
+import math
+import types
+
+from django.db.models.query import QuerySet
+from django.utils.encoding import force_unicode
+from django.utils.translation import ugettext as _
+
+# Python 2.3 compatibility
+try:
+    set
+except NameError:
+    from sets import Set as set
+
+def parse_tag_input(input):
+    """
+    Parses tag input, with multiple word input being activated and
+    delineated by commas and double quotes. Quotes take precedence, so
+    they may contain commas.
+
+    Returns a sorted list of unique tag names.
+    """
+    if not input:
+        return []
+
+    input = force_unicode(input)
+
+    # Special case - if there are no commas or double quotes in the
+    # input, we don't *do* a recall... I mean, we know we only need to
+    # split on spaces.
+    if u',' not in input and u'"' not in input:
+        words = list(set(split_strip(input, u' ')))
+        words.sort()
+        return words
+
+    words = []
+    buffer = []
+    # Defer splitting of non-quoted sections until we know if there are
+    # any unquoted commas.
+    to_be_split = []
+    saw_loose_comma = False
+    open_quote = False
+    i = iter(input)
+    try:
+        while 1:
+            c = i.next()
+            if c == u'"':
+                if buffer:
+                    to_be_split.append(u''.join(buffer))
+                    buffer = []
+                # Find the matching quote
+                open_quote = True
+                c = i.next()
+                while c != u'"':
+                    buffer.append(c)
+                    c = i.next()
+                if buffer:
+                    word = u''.join(buffer).strip()
+                    if word:
+                        words.append(word)
+                    buffer = []
+                open_quote = False
+            else:
+                if not saw_loose_comma and c == u',':
+                    saw_loose_comma = True
+                buffer.append(c)
+    except StopIteration:
+        # If we were parsing an open quote which was never closed treat
+        # the buffer as unquoted.
+        if buffer:
+            if open_quote and u',' in buffer:
+                saw_loose_comma = True
+            to_be_split.append(u''.join(buffer))
+    if to_be_split:
+        if saw_loose_comma:
+            delimiter = u','
+        else:
+            delimiter = u' '
+        for chunk in to_be_split:
+            words.extend(split_strip(chunk, delimiter))
+    words = list(set(words))
+    words.sort()
+    return words
+
+def split_strip(input, delimiter=u','):
+    """
+    Splits ``input`` on ``delimiter``, stripping each resulting string
+    and returning a list of non-empty strings.
+    """
+    if not input:
+        return []
+
+    words = [w.strip() for w in input.split(delimiter)]
+    return [w for w in words if w]
+
+def edit_string_for_tags(tags):
+    """
+    Given list of ``Tag`` instances, creates a string representation of
+    the list suitable for editing by the user, such that submitting the
+    given string representation back without changing it will give the
+    same list of tags.
+
+    Tag names which contain commas will be double quoted.
+
+    If any tag name which isn't being quoted contains whitespace, the
+    resulting string of tag names will be comma-delimited, otherwise
+    it will be space-delimited.
+    """
+    names = []
+    use_commas = False
+    for tag in tags:
+        name = tag.name
+        if u',' in name:
+            names.append('"%s"' % name)
+            continue
+        elif u' ' in name:
+            if not use_commas:
+                use_commas = True
+        names.append(name)
+    if use_commas:
+        glue = u', '
+    else:
+        glue = u' '
+    return glue.join(names)
+
+def get_queryset_and_model(queryset_or_model):
+    """
+    Given a ``QuerySet`` or a ``Model``, returns a two-tuple of
+    (queryset, model).
+
+    If a ``Model`` is given, the ``QuerySet`` returned will be created
+    using its default manager.
+    """
+    try:
+        return queryset_or_model, queryset_or_model.model
+    except AttributeError:
+        return queryset_or_model._default_manager.all(), queryset_or_model
+
+def get_tag_list(tags):
+    """
+    Utility function for accepting tag input in a flexible manner.
+
+    If a ``Tag`` object is given, it will be returned in a list as
+    its single occupant.
+
+    If given, the tag names in the following will be used to create a
+    ``Tag`` ``QuerySet``:
+
+       * A string, which may contain multiple tag names.
+       * A list or tuple of strings corresponding to tag names.
+       * A list or tuple of integers corresponding to tag ids.
+
+    If given, the following will be returned as-is:
+
+       * A list or tuple of ``Tag`` objects.
+       * A ``Tag`` ``QuerySet``.
+
+    """
+    from calibre.www.apps.tagging.models import Tag
+    if isinstance(tags, Tag):
+        return [tags]
+    elif isinstance(tags, QuerySet) and tags.model is Tag:
+        return tags
+    elif isinstance(tags, types.StringTypes):
+        return Tag.objects.filter(name__in=parse_tag_input(tags))
+    elif isinstance(tags, (types.ListType, types.TupleType)):
+        if len(tags) == 0:
+            return tags
+        contents = set()
+        for item in tags:
+            if isinstance(item, types.StringTypes):
+                contents.add('string')
+            elif isinstance(item, Tag):
+                contents.add('tag')
+            elif isinstance(item, (types.IntType, types.LongType)):
+                contents.add('int')
+        if len(contents) == 1:
+            if 'string' in contents:
+                return Tag.objects.filter(name__in=[force_unicode(tag) \
+                                                    for tag in tags])
+            elif 'tag' in contents:
+                return tags
+            elif 'int' in contents:
+                return Tag.objects.filter(id__in=tags)
+        else:
+            raise ValueError(_('If a list or tuple of tags is provided, they must all be tag names, Tag objects or Tag ids.'))
+    else:
+        raise ValueError(_('The tag input given was invalid.'))
+
+def get_tag(tag):
+    """
+    Utility function for accepting single tag input in a flexible
+    manner.
+
+    If a ``Tag`` object is given it will be returned as-is; if a
+    string or integer are given, they will be used to lookup the
+    appropriate ``Tag``.
+
+    If no matching tag can be found, ``None`` will be returned.
+    """
+    from calibre.www.apps.tagging.models import Tag
+    if isinstance(tag, Tag):
+        return tag
+
+    try:
+        if isinstance(tag, types.StringTypes):
+            return Tag.objects.get(name=tag)
+        elif isinstance(tag, (types.IntType, types.LongType)):
+            return Tag.objects.get(id=tag)
+    except Tag.DoesNotExist:
+        pass
+
+    return None
+
+# Font size distribution algorithms
+LOGARITHMIC, LINEAR = 1, 2
+
+def _calculate_thresholds(min_weight, max_weight, steps):
+    delta = (max_weight - min_weight) / float(steps)
+    return [min_weight + i * delta for i in range(1, steps + 1)]
+
+def _calculate_tag_weight(weight, max_weight, distribution):
+    """
+    Logarithmic tag weight calculation is based on code from the
+    `Tag Cloud`_ plugin for Mephisto, by Sven Fuchs.
+
+    .. _`Tag Cloud`: http://www.artweb-design.de/projects/mephisto-plugin-tag-cloud
+    """
+    if distribution == LINEAR or max_weight == 1:
+        return weight
+    elif distribution == LOGARITHMIC:
+        return math.log(weight) * max_weight / math.log(max_weight)
+    raise ValueError(_('Invalid distribution algorithm specified: %s.') % distribution)
+
+def calculate_cloud(tags, steps=4, distribution=LOGARITHMIC):
+    """
+    Add a ``font_size`` attribute to each tag according to the
+    frequency of its use, as indicated by its ``count``
+    attribute.
+
+    ``steps`` defines the range of font sizes - ``font_size`` will
+    be an integer between 1 and ``steps`` (inclusive).
+
+    ``distribution`` defines the type of font size distribution
+    algorithm which will be used - logarithmic or linear. It must be
+    one of ``tagging.utils.LOGARITHMIC`` or ``tagging.utils.LINEAR``.
+    """
+    if len(tags) > 0:
+        counts = [tag.count for tag in tags]
+        min_weight = float(min(counts))
+        max_weight = float(max(counts))
+        thresholds = _calculate_thresholds(min_weight, max_weight, steps)
+        for tag in tags:
+            font_set = False
+            tag_weight = _calculate_tag_weight(tag.count, max_weight, distribution)
+            for i in range(steps):
+                if not font_set and tag_weight <= thresholds[i]:
+                    tag.font_size = i + 1
+                    font_set = True
+    return tags
diff --git a/src/calibre/www/apps/tagging/views.py b/src/calibre/www/apps/tagging/views.py
new file mode 100644
index 0000000000..53360da383
--- /dev/null
+++ b/src/calibre/www/apps/tagging/views.py
@@ -0,0 +1,52 @@
+"""
+Tagging related views.
+"""
+from django.http import Http404
+from django.utils.translation import ugettext as _
+from django.views.generic.list_detail import object_list
+
+from calibre.www.apps.tagging.models import Tag, TaggedItem
+from calibre.www.apps.tagging.utils import get_tag, get_queryset_and_model
+
+def tagged_object_list(request, queryset_or_model=None, tag=None,
+        related_tags=False, related_tag_counts=True, **kwargs):
+    """
+    A thin wrapper around
+    ``django.views.generic.list_detail.object_list`` which creates a
+    ``QuerySet`` containing instances of the given queryset or model
+    tagged with the given tag.
+
+    In addition to the context variables set up by ``object_list``, a
+    ``tag`` context variable will contain the ``Tag`` instance for the
+    tag.
+
+    If ``related_tags`` is ``True``, a ``related_tags`` context variable
+    will contain tags related to the given tag for the given model.
+    Additionally, if ``related_tag_counts`` is ``True``, each related
+    tag will have a ``count`` attribute indicating the number of items
+    which have it in addition to the given tag.
+    """
+    if queryset_or_model is None:
+        try:
+            queryset_or_model = kwargs.pop('queryset_or_model')
+        except KeyError:
+            raise AttributeError(_('tagged_object_list must be called with a queryset or a model.'))
+
+    if tag is None:
+        try:
+            tag = kwargs.pop('tag')
+        except KeyError:
+            raise AttributeError(_('tagged_object_list must be called with a tag.'))
+
+    tag_instance = get_tag(tag)
+    if tag_instance is None:
+        raise Http404(_('No Tag found matching "%s".') % tag)
+    queryset = TaggedItem.objects.get_by_model(queryset_or_model, tag_instance)
+    if not kwargs.has_key('extra_context'):
+        kwargs['extra_context'] = {}
+    kwargs['extra_context']['tag'] = tag_instance
+    if related_tags:
+        kwargs['extra_context']['related_tags'] = \
+            Tag.objects.related_for_model(tag_instance, queryset_or_model,
+                                          counts=related_tag_counts)
+    return object_list(request, queryset, **kwargs)
diff --git a/src/calibre/www/kovid/__init__.py b/src/calibre/www/kovid/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/www/kovid/manage.py b/src/calibre/www/kovid/manage.py
new file mode 100644
index 0000000000..5e78ea979e
--- /dev/null
+++ b/src/calibre/www/kovid/manage.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+    import settings # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+    sys.exit(1)
+
+if __name__ == "__main__":
+    execute_manager(settings)
diff --git a/src/calibre/www/kovid/settings.py b/src/calibre/www/kovid/settings.py
new file mode 100644
index 0000000000..8d89c5e373
--- /dev/null
+++ b/src/calibre/www/kovid/settings.py
@@ -0,0 +1,49 @@
+# Django settings for planet project.
+
+from calibre.www.settings import DEBUG, TEMPLATE_DEBUG, ADMINS, MANAGERS, \
+        TEMPLATE_LOADERS, TEMPLATE_DIRS, MIDDLEWARE_CLASSES, MEDIA_ROOT, \
+        MEDIA_URL, ADMIN_MEDIA_PREFIX, TEMPLATE_CONTEXT_PROCESSORS
+
+FORCE_LOWERCASE_TAGS = False
+MAX_TAG_LENGTH = 50
+
+if not DEBUG:
+    MEDIA_URL = 'http://kovid.calibre-ebook.com/site_media/'
+    ADMIN_MEDIA_PREFIX = 'http://kovid.calibre-ebook.com/admin_media/'
+    MEDIA_ROOT = '/usr/local/calibre/src/calibre/www/static/'
+
+
+if DEBUG:
+    DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+    DATABASE_NAME   = '/tmp/kovid.db'     # Or path to database file if using sqlite3.
+else:
+    DATABASE_ENGINE = 'mysql'
+    DATABASE_NAME   = 'calibre_kovid'
+    DATABASE_USER   = 'calibre_django'
+    DATABASE_PASSWORD = open('/var/www/calibre-ebook.com/dbpass').read().strip()
+
+SITE_ID = 1
+
+# Make this unique, and don't share it with anybody.
+if DEBUG:
+    SECRET_KEY = '06mv&t$cobjkijgg#0ndwm5#&90_(tm=oqi1bv-x^vii$*33n5'
+else:
+    SECRET_KEY = open('/var/www/kovid.calibre-ebook.com/django_secret_key').read().strip()
+
+
+ROOT_URLCONF = 'calibre.www.kovid.urls'
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.comments',
+    'calibre.www.apps.inlines',
+    'calibre.www.apps.tagging',
+    'calibre.www.apps.blog',
+
+)
+
+
diff --git a/src/calibre/www/kovid/urls.py b/src/calibre/www/kovid/urls.py
new file mode 100644
index 0000000000..e5a33b2597
--- /dev/null
+++ b/src/calibre/www/kovid/urls.py
@@ -0,0 +1,24 @@
+from django.conf.urls.defaults import patterns, include, handler404, handler500
+from django.conf import settings
+
+# Uncomment the next two lines to enable the admin:
+#from django.contrib import admin
+#admin.autodiscover()
+
+urlpatterns = patterns('',
+
+ #       (r'^admin/(.*)', admin.site.root),
+
+    (r'^comments/', include('django.contrib.comments.urls')),
+
+
+)
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
+            {'document_root': settings.MEDIA_ROOT}),
+    )
+
+
+
diff --git a/src/calibre/www/planet/README.rst b/src/calibre/www/planet/README.rst
new file mode 100644
index 0000000000..8f40603284
--- /dev/null
+++ b/src/calibre/www/planet/README.rst
@@ -0,0 +1,12 @@
+Test
+=====
+
+Calibre planet can be run either in development mode or deployment mode. For testing,
+it should be run in development mode as follows:
+
+    * Install django
+    * ``cd test && ./test``
+    * Planet is at `http://localhost:8000`
+
+
+
diff --git a/src/calibre/www/planet/__init__.py b/src/calibre/www/planet/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/www/planet/manage.py b/src/calibre/www/planet/manage.py
new file mode 100644
index 0000000000..5e78ea979e
--- /dev/null
+++ b/src/calibre/www/planet/manage.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+    import settings # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+    sys.exit(1)
+
+if __name__ == "__main__":
+    execute_manager(settings)
diff --git a/src/calibre/www/planet/settings.py b/src/calibre/www/planet/settings.py
new file mode 100644
index 0000000000..cd2f56ceb1
--- /dev/null
+++ b/src/calibre/www/planet/settings.py
@@ -0,0 +1,42 @@
+# Django settings for planet project.
+
+from calibre.www.settings import DEBUG, TEMPLATE_DEBUG, ADMINS, MANAGERS, \
+        TEMPLATE_LOADERS, TEMPLATE_DIRS, MIDDLEWARE_CLASSES, MEDIA_ROOT, \
+        MEDIA_URL, ADMIN_MEDIA_PREFIX, TEMPLATE_CONTEXT_PROCESSORS
+
+if not DEBUG:
+    MEDIA_URL = 'http://planet.calibre-ebook.com/site_media/'
+    ADMIN_MEDIA_PREFIX = 'http://planet.calibre-ebook.com/admin_media/'
+    MEDIA_ROOT = '/usr/local/calibre/src/calibre/www/static/'
+
+
+if DEBUG:
+    DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+    DATABASE_NAME = '/tmp/planet.db'      # Or path to database file if using sqlite3.
+else:
+    DATABASE_ENGINE = 'mysql'
+    DATABASE_NAME   = 'calibre_planet'
+    DATABASE_USER   = 'calibre_django'
+    DATABASE_PASSWORD = open('/var/www/calibre-ebook.com/dbpass').read().strip()
+
+SITE_ID = 1
+
+# Make this unique, and don't share it with anybody.
+if DEBUG:
+    SECRET_KEY = '06mv&t$cobjkijgg#0ndwm5#&90_(tm=oqi1bv-x^vii$*33n5'
+else:
+    SECRET_KEY = open('/var/www/planet.calibre-ebook.com/django_secret_key').read().strip()
+
+
+ROOT_URLCONF = 'calibre.www.planet.urls'
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'calibre.www.apps.feedjack',
+)
+
+
diff --git a/src/calibre/www/planet/test/planet.db b/src/calibre/www/planet/test/planet.db
new file mode 100644
index 0000000000..413abd4875
Binary files /dev/null and b/src/calibre/www/planet/test/planet.db differ
diff --git a/src/calibre/www/planet/test/test.sh b/src/calibre/www/planet/test/test.sh
new file mode 100755
index 0000000000..64a0976462
--- /dev/null
+++ b/src/calibre/www/planet/test/test.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+cp planet.db /tmp
+cd ..
+python manage.py runserver
diff --git a/src/calibre/www/planet/urls.py b/src/calibre/www/planet/urls.py
new file mode 100644
index 0000000000..fbe39425fe
--- /dev/null
+++ b/src/calibre/www/planet/urls.py
@@ -0,0 +1,24 @@
+from django.conf.urls.defaults import patterns, include, handler404, handler500
+from django.conf import settings
+
+# Uncomment the next two lines to enable the admin:
+from django.contrib import admin
+admin.autodiscover()
+
+urlpatterns = patterns('',
+
+        (r'^admin/(.*)', admin.site.root),
+
+
+        (r'', include('calibre.www.apps.feedjack.urls')),
+
+)
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
+            {'document_root': settings.MEDIA_ROOT}),
+    )
+
+
+
diff --git a/src/calibre/www/publish.sh b/src/calibre/www/publish.sh
new file mode 100755
index 0000000000..c78f0a1d89
--- /dev/null
+++ b/src/calibre/www/publish.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ssh divok "cd /usr/local/calibre && bzr pull"
+ssh divok /etc/init.d/apache2 graceful
diff --git a/src/calibre/www/settings.py b/src/calibre/www/settings.py
new file mode 100644
index 0000000000..d20185c943
--- /dev/null
+++ b/src/calibre/www/settings.py
@@ -0,0 +1,86 @@
+# Django settings
+# Import base settings from here into the site specific settings files
+
+import socket, os
+
+DEBUG = socket.gethostname() != 'divok'
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+     ('Kovid Goyal', 'kovid@kovidgoyal.net'),
+)
+
+MANAGERS = ADMINS
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+if DEBUG:
+    MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'static/')
+else:
+    MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+if DEBUG:
+    MEDIA_URL = 'http://127.0.0.1:8000/site_media/'
+else:
+    MEDIA_URL = 'http://planet.calibre-ebook.com/site_media/'
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/media/'
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'America/Los_Angeles'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = False
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.app_directories.load_template_source',
+#     'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+)
+
+ROOT_URLCONF = 'planet.urls'
+
+
+if DEBUG:
+    TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+        os.path.join(os.path.dirname(__file__), 'templates'),
+    )
+else:
+    TEMPLATE_DIRS = (
+            '/usr/local/calibre/src/calibre/www/templates',
+    )
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.core.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media"
+    )
+
+
+
diff --git a/src/calibre/www/static/img/button-atom.png b/src/calibre/www/static/img/button-atom.png
new file mode 100644
index 0000000000..420c21b1f1
Binary files /dev/null and b/src/calibre/www/static/img/button-atom.png differ
diff --git a/src/calibre/www/static/img/button-css.png b/src/calibre/www/static/img/button-css.png
new file mode 100644
index 0000000000..706325e1c1
Binary files /dev/null and b/src/calibre/www/static/img/button-css.png differ
diff --git a/src/calibre/www/static/img/button-django.png b/src/calibre/www/static/img/button-django.png
new file mode 100644
index 0000000000..a1578cf7c2
Binary files /dev/null and b/src/calibre/www/static/img/button-django.png differ
diff --git a/src/calibre/www/static/img/button-foaf.png b/src/calibre/www/static/img/button-foaf.png
new file mode 100644
index 0000000000..df4d80ebc3
Binary files /dev/null and b/src/calibre/www/static/img/button-foaf.png differ
diff --git a/src/calibre/www/static/img/button-hacker.png b/src/calibre/www/static/img/button-hacker.png
new file mode 100644
index 0000000000..5a2e1850f0
Binary files /dev/null and b/src/calibre/www/static/img/button-hacker.png differ
diff --git a/src/calibre/www/static/img/button-opml.png b/src/calibre/www/static/img/button-opml.png
new file mode 100644
index 0000000000..cf7ff01372
Binary files /dev/null and b/src/calibre/www/static/img/button-opml.png differ
diff --git a/src/calibre/www/static/img/button-rss.png b/src/calibre/www/static/img/button-rss.png
new file mode 100644
index 0000000000..b036f7152b
Binary files /dev/null and b/src/calibre/www/static/img/button-rss.png differ
diff --git a/src/calibre/www/static/img/button-xhtml.png b/src/calibre/www/static/img/button-xhtml.png
new file mode 100644
index 0000000000..ec686442cc
Binary files /dev/null and b/src/calibre/www/static/img/button-xhtml.png differ
diff --git a/src/calibre/www/static/img/faces/calibre.png b/src/calibre/www/static/img/faces/calibre.png
new file mode 100644
index 0000000000..fee0c4fdd8
Binary files /dev/null and b/src/calibre/www/static/img/faces/calibre.png differ
diff --git a/src/calibre/www/static/img/faces/john.png b/src/calibre/www/static/img/faces/john.png
new file mode 100644
index 0000000000..dee76699fd
Binary files /dev/null and b/src/calibre/www/static/img/faces/john.png differ
diff --git a/src/calibre/www/static/img/faces/nobody.png b/src/calibre/www/static/img/faces/nobody.png
new file mode 100644
index 0000000000..dee76699fd
Binary files /dev/null and b/src/calibre/www/static/img/faces/nobody.png differ
diff --git a/src/calibre/www/static/img/feed.png b/src/calibre/www/static/img/feed.png
new file mode 100644
index 0000000000..6e7b676b34
Binary files /dev/null and b/src/calibre/www/static/img/feed.png differ
diff --git a/src/calibre/www/static/img/logo.png b/src/calibre/www/static/img/logo.png
new file mode 100644
index 0000000000..5d430ed4db
Binary files /dev/null and b/src/calibre/www/static/img/logo.png differ
diff --git a/src/calibre/www/static/styles/base.css b/src/calibre/www/static/styles/base.css
new file mode 100644
index 0000000000..96dd38ffa4
--- /dev/null
+++ b/src/calibre/www/static/styles/base.css
@@ -0,0 +1,40 @@
+body {
+    font-family: sansserif;
+    background-color: #f1fff1;
+}
+
+img {
+    border:0 none;
+}
+
+#_header {
+    width: 100%;
+    border-bottom: 1px solid black;
+    margin-bottom: 20px;
+    height: 100px;
+    background-color: #A2B964;
+    overflow: hidden;
+}
+
+#_header > h1 { 
+    margin: 0px; padding: 0px;
+    font-size: 60px;
+    font-family: sansserif;
+    font-weight: normal;
+}
+
+#_logo { 
+    vertical-align: middle;
+}
+
+#_footer {
+    font-size: small;
+    text-align: right;
+    width: 100%;
+    border-top: 1px solid black;
+    font-style: italic;
+    padding-top: 10px; 
+    padding-bottom: 5px;
+}
+
+#_footer img { vertical-align: middle; }
diff --git a/src/calibre/www/static/styles/codebox.css b/src/calibre/www/static/styles/codebox.css
new file mode 100644
index 0000000000..c621b33230
--- /dev/null
+++ b/src/calibre/www/static/styles/codebox.css
@@ -0,0 +1,115 @@
+/* codebox header */
+.wp_codebox_msgheader {
+	width: 100%;
+	border: 1px solid #DEDEB8;
+	border-bottom: 0;
+	font-weight: bold;
+	background: #F3F8D7 url(../images/arrow-square.gif) no-repeat right 5px;
+	color: #000000;
+}
+
+.wp_codebox_msgheader.active {
+	background-position: right -51px;
+}
+
+.wp_codebox_msgheader .right {
+	float: right;
+	text-align: right;
+	padding: 5px;
+	margin-right: 20px;
+}
+
+.wp_codebox_msgheader .right a {
+	font: 12px Arial, Tahoma !important;
+	font: 11px Arial, Tahoma;
+}
+
+.wp_codebox_msgheader .left,.wp_codebox_msgheader .left2 {
+	float: left;
+	/*	background-color:#FFFFFF; 
+	border:1px solid #DCDCDC;
+	padding:8px 0px 2px 8px;*/
+	font-family: tahoma, arial, verdana;
+	/*	display: block;
+	width:50%;
+	margin: 0 auto;*/
+	padding: 5px 5px 5px 20px;
+	margin-left: 5px;
+}
+
+.wp_codebox_msgheader .left {
+	background: url(../images/view_code.png) no-repeat left;
+}
+
+.wp_codebox_msgheader .left2 {
+	background: url(../images/down.gif) no-repeat left;
+}
+
+.wp_codebox_msgheader .left a { /*	margin:0px 5px 0px 10px;*/
+	font-weight: bold;
+}
+
+.wp_codebox_msgheader .left2 a { /*	margin:0px 5px 0px 5px;*/
+	font-weight: bold;
+}
+
+.wp_codebox_msgheader .codebox_clear {
+	clear: both;
+}
+
+/* codebox */
+.wp_codebox {
+	color: #100;
+	background-color: #f9f9f9;
+	border: 1px solid silver;
+	margin: 0 0 1.5em 0;
+	overflow: auto;
+}
+
+/* IE FIX */
+.wp_codebox {
+	overflow-x: auto;
+	overflow-y: hidden;
+	padding-bottom: expression(this.scrollWidth >   this.offsetWidth ?   15 :   0)
+		;
+	width: 100%;
+}
+
+.wp_codebox table {
+	border-collapse: collapse;
+	border: none;
+	margin: 0px;
+}
+
+.wp_codebox div,.wp_codebox td {
+	vertical-align: top;
+	padding: 2px 4px;
+}
+
+.wp_codebox td.line_numbers {
+	text-align: right;
+	background-color: #def;
+	color: #666;
+	overflow: visible;
+	border-right: 1px solid #B0BEC7;
+	table-layout: auto;
+	width: 15px;
+}
+
+/* potential overrides for other styles */
+.wp_codebox pre {
+	border: none;
+	background: none;
+	margin: 0;
+	padding: 0;
+	width: auto;
+	float: none;
+	clear: none;
+	overflow: visible;
+	font-size: 12px;
+	line-height: 1.333;
+}
+
+.line_numbers pre {
+	padding-left: 10px;
+}
\ No newline at end of file
diff --git a/src/calibre/www/static/styles/planet.css b/src/calibre/www/static/styles/planet.css
new file mode 100644
index 0000000000..8cbca4a359
--- /dev/null
+++ b/src/calibre/www/static/styles/planet.css
@@ -0,0 +1,313 @@
+/*
+ * Feedjack LostWoods theme
+ **************************
+ * Simple and green (where's the brown? -brown doesn't count)
+ *
+ * Copyright Diego Escalante Urrelo <diegoe@gnome.org>
+ *
+ */
+body {
+    font-size: 0.8em;
+    font-family: verdana;
+    margin: 0;
+}
+div {
+    /*border: 1px solid blue;
+    padding: 5px;
+    margin: 5px;*/
+}
+/*
+ * Structure
+ */
+#logo {
+    padding-top: 3px;
+    padding-left: 1em;
+}
+#tags {
+    overflow: auto;
+    padding: 5px;
+    text-align: right;
+}
+#paginate {
+    margin-bottom: 15px;
+    margin-left: 0px;
+    margin-top: 5px;
+    padding-left: 0;
+    text-align: left;
+    vertical-align: middle;
+    float: left;
+    width: 60%;
+    color: black;
+}
+#buttons {
+    text-align: right;
+    float: right;
+    vertical-align: middle;
+    color: #aaa;
+    width: 40%;
+    line-height: 1.7em;
+    padding:0;
+    padding-bottom: 10px;
+}
+#usertags {
+    clear: both;
+    margin: 5px;
+    padding: 5px;
+    width: 75%;
+    text-align: center;
+}
+#post_list {  
+    clear : both;
+    width: 75%;
+}
+#sidebar {
+    width: 20%;
+    position: absolute;
+    right:0;
+    top: 170px;
+    border-left: 10px outset #6E9C60;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+div.date {
+    font-size: x-large;
+    text-align: center;
+    font-style: italic;
+    padding: 5px;
+    color: black;
+    border: 2px solid #6E9C60; 
+    border-right: 0;
+    border-left: 0;
+    margin-bottom: 10px;
+    
+}
+/*
+ * Post structure
+ */
+div.post {
+    overflow: auto;
+    margin-bottom: 50px;
+    padding-bottom: 30px;
+    border-bottom: 12px solid #6E9C60;
+    border-right: 1px inset #6E9C60;
+    padding-right: 10px;
+}
+div.avatar {
+    float: right;
+    width: 15%;
+    text-align: center;
+}
+div.post-title {
+    text-align: left;
+    
+    font-size: 180%;
+    font-family: trebuchet ms;
+    font-weight: bold;
+    padding: 5px;
+    width: 75%;
+}
+div.post-content {
+    width: 72%;
+    overflow: auto;
+    text-align: justify;
+    font-size: 90%;
+    line-height: 1.8em;
+    padding-left: 4em;
+    padding-right: 4em;
+    border-right: 1px dotted #ccc;
+}
+div.post-content li {
+    line-height: 130%;
+    margin-bottom: 0.6em;
+}
+div.post-content table{
+    border: 0;
+    margin-left: 50px;
+
+}
+div.post-content td {
+    border: 2px solid #ccc;
+}
+div.post-meta {
+    color: #666;
+    margin-top: 20px;
+    border-top: 1px solid #ccc;
+    width: 100%;
+    text-align: right;
+}
+div.tags {
+    margin-top: 10px;
+}
+
+/* 
+ * Elements
+ */
+blockquote {
+	color: 				#777;
+	margin:				15px	30px 0px	10px;
+	padding: 20px;
+	border: 1px solid #ddd;
+	border-left:		7px	solid	#ddd;
+	
+}
+a:link {
+    color: #4C6B46;
+}
+a:hover {
+    color: #33408A;
+}
+h1 a:link {
+    text-decoration: none;
+    color: inherit;
+}
+#buttons img {
+    vertical-align: middle;
+}
+#head h1 {
+    font-style: italic;
+    font-size: xx-large;
+    border-bottom: 3px solid #6E9C60;
+    margin-bottom: 5px;
+    margin-top: 10px;
+}
+#head a:link, a:visited, #head a:active { 
+    color: inherit;
+}
+.love_feedjack {
+    font-size: 145%;
+    font-weight: bold;
+    font-style: italic;
+}
+.cloud_1 {
+    font-size: 50%;
+}
+.cloud_2 {
+    font-size: 100%;
+}
+.cloud_3 {
+    font-size: 120%;
+    font-weight: bold;
+}
+.cloud_4 {
+    font-size: 140%;
+    font-weight: bold;
+}
+.cloud_5 {
+    font-size: 160%;
+    font-weight: bold;
+}
+#paginate ul {
+    margin:0;
+    padding:0;
+}
+#paginate li { 
+    display: inline;
+    margin: 2px;
+    padding: 10px;
+    background-color: #fbfbfb;
+    border: 2px solid #ddd;
+    line-height: 1.7em;
+    margin-left: 3px;
+    margin-right: 3px;
+    text-align: center;
+    vertical-align: middle;
+}
+#paginate li.tagname {
+    font-weight: bold;
+    font-size: 140%;
+}
+#paginate a:link {
+    color: #4C6B46;
+}
+
+#paginate a { text-decoration: none; }
+
+img {
+    border: 0;
+}
+#sidebar ul {
+    list-style-type:	none;
+    padding: 0;
+    margin: 0;
+}
+#sidebar li {
+    display: block;
+    clear: both;
+    line-height: 25px;
+}
+#sidebar a.nombre {
+    display: inline;
+    color: #33408A;
+    vertical-align: middle;
+    margin-left: 2px;
+    margin-right: 2px;
+}
+#sidebar img.face {
+    vertical-align: middle;
+    margin-right: 5px;
+}
+#sidebar h4 {
+    font-style: italic;
+    border-bottom: 1px solid #ccc;
+}
+
+#sidebar h4 + p {
+    text-align: justify;
+}
+#tags ul, #usertags ul {
+    background-color: #fbfbfb;
+    padding: 5px;
+    border: 2px solid #ddd;
+    margin:0;
+    text-align: center;
+}
+#tags li, #usertags li { 
+    display: inline;
+    margin: 0;
+    line-height: 1.7em;
+    margin-left: 3px;
+    margin-right: 3px;
+}
+#tags a:link, #usertags a:link {
+    color: #4C6B46;
+}
+span.name {
+    color: #333;
+}
+span.nick {
+    color: #555;
+}
+span.url a {
+    color: #bbb;
+}
+span.url a:hover {
+    color: #777;
+}
+
+div.tags ul {
+    background-color: #fbfbfb;
+    padding: 5px;
+    border: 2px solid #ddd;
+    margin:0;
+    text-align: center;
+}
+div.tags li { 
+    display: inline;
+    margin: 0;
+    line-height: 1.7em;
+    margin-left: 3px;
+    margin-right: 3px;
+}
+
+#planet_donate
+{
+    text-align: center;
+    border-top: 1px solid gray;
+    border-bottom: 1px solid gray;
+    padding-top: 5px; padding-bottom: 5px;
+}
+
+#planet_ads {
+    text-align: center;
+}
+
diff --git a/src/calibre/www/templates/404.html b/src/calibre/www/templates/404.html
new file mode 100644
index 0000000000..e2b32e79ea
--- /dev/null
+++ b/src/calibre/www/templates/404.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block title %}Page not found{% endblock %}
+
+{% block header_text %}Page not found{% endblock %}
+
+{% block content %}
+
+<p>Sorry, but the requested page could not be found.</p>
+{% endblock %}
+
+{% block footer_text %} {% endblock %}
diff --git a/src/calibre/www/templates/500.html b/src/calibre/www/templates/500.html
new file mode 100644
index 0000000000..fec6540d62
--- /dev/null
+++ b/src/calibre/www/templates/500.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+    "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+    <title>Page unavailable</title>
+</head>
+<body>
+    <h1>Page unavailable</h1>
+
+    <p>Sorry, but the requested page is unavailable due to a
+    server hiccup.</p>
+
+    <p>Our engineers have been notified, so check back later.</p>
+</body>
+</html>
+
diff --git a/src/calibre/www/templates/base.html b/src/calibre/www/templates/base.html
new file mode 100644
index 0000000000..1453d4ab73
--- /dev/null
+++ b/src/calibre/www/templates/base.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<!--
+  Base template that defines navigation/sidebars etc. 
+ -->
+<head>
+    <title>{% block title %}calibre - E-book management{% endblock %}</title>
+    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/styles/base.css" />
+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+    {% block extra_header %} {% endblock %}
+</head>
+
+<body>
+    <div id="_header">
+        <h1>
+            <img id="_logo" alt="calibre" src="{{ MEDIA_URL }}/img/logo.png" />
+            {% block header_text %}e-book management{% endblock %}
+        </h1>
+    </div>
+    <div id="_content">
+        {% block content %}Hello world{% endblock %}
+    </div>
+
+    <div id="_footer">
+        {% block footer_text %}
+        Created by Kovid Goyal. 
+        Powered by <a href="http://www.djangoproject.com">
+            <img alt="Django" src="{{ MEDIA_URL }}/img/button-django.png"/>
+        </a>&nbsp;&nbsp;
+        {% endblock %}
+    </div>
+</body>
+</html>
diff --git a/src/calibre/www/templates/feedjack/default/post_list.html b/src/calibre/www/templates/feedjack/default/post_list.html
new file mode 100644
index 0000000000..25ecb152b0
--- /dev/null
+++ b/src/calibre/www/templates/feedjack/default/post_list.html
@@ -0,0 +1,190 @@
+{% extends "base.html" %}
+
+{% block title%}Calibre Planet{% endblock %}
+{% block header_text %}Planet{% endblock %}
+
+{% block extra_header %}
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/styles/planet.css" /> 
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/styles/codebox.css" /> 
+{% endblock %}
+
+{% block content %}
+<div id="paginate">
+<ul>
+
+{% if has_previous %}
+<li><a href="?page={{ previous }}">&lt;&lt;</a></li>
+{% endif %}
+<li>
+  Page {{ page }} of {{ pages }} ({{ hits }} posts) 
+</li>
+{% if has_next %}
+<li><a href="?page={{ next }}">&gt;&gt;</a></li>
+{% endif %}
+{% if user %}
+<li class="username"><a href="{{ user.feed.link }}">{{ user.name }}</a>talks about »</li>
+{% endif %}
+{% if tag %}
+<li class="tagname">{{ tag.name }}</li>
+{% endif %}
+</ul>
+</div> <!-- end paginate -->
+
+<div id="buttons">
+      <a href="{{ site.url }}/feed/rss/" title="RSS 2.0 feed"><img src="{{ MEDIA_URL }}/img/button-rss.png"/></a> &bull;   
+      <a href="{{ site.url }}/feed/atom/" title="Atom 1.0 feed"><img src="{{ MEDIA_URL }}/img/button-atom.png"/></a> &bull; 
+      <a href="{{ site.url }}/opml/" title="OPML"><img src="{{ MEDIA_URL }}/img/button-opml.png"/></a> &bull; 
+      <a href="{{ site.url }}/foaf/" title="FOAF"><img src="{{ MEDIA_URL }}/img/button-foaf.png"/></a>
+</div> <!-- end buttons -->
+
+<div id="post_list">
+{% for item in object_list %}
+
+  {% ifchanged %}
+  <div class="date">{{ item.date_modified|date:"F j, Y" }}</div>
+  {% endifchanged %}
+
+  <div class="post">
+  {% ifchanged %}
+  <!-- {{ item.date_modified|date:"F j, Y" }} -->
+  <div class="avatar">
+    <a href="{{ item.feed.link }}">
+        <img 
+        src="{{ MEDIA_URL }}/img/faces/{{ item.subscriber.shortname}}.png" alt="" />
+        <div class="url">
+            {{ item.feed.title|safe }}
+        </div>
+    </a>
+  </div>
+  {% endifchanged %}
+
+  {% if item.title %}
+  <div class="post-title">» {{ item.title }}</div>
+  {% else %}
+  <div class="post-title">» {{ item.subscriber.name }}</div>
+  {% endif %}
+  <div class="post-content">
+    <p>{{ item.content|safe }}</p>
+    <div class="post-meta">
+      <a href="{{ item.link }}">
+      {% if item.author %}by {{ item.author }} at{% endif %}
+      {{ item.date_modified|date:"g:i A" }}</a>
+      {% for tag in item.qtags %}
+          {% if forloop.first %}under{% endif %}
+          <a href="{{ site.url }}/tag/{{ tag.name }}">{{ tag.name }}</a>
+          {% if not forloop.last %}, {% endif %}
+      {% endfor %}
+      {% if item.comments %}
+        <a href="{{ item.comments }}">(Comments)</a>
+      {% endif %}
+    </div>
+  </div>
+  </div>
+{% endfor %}
+</div>
+
+
+<div id="sidebar">
+<h4>{{ site.name }}</h4>
+
+<p style="text-align:left">
+Planet Calibre is a window into the world, work and lives of Calibre developers and contributors.
+</p>
+<p style="text-align:left">
+If you have a question or would like your blog added to the planet, please email 
+<a href="mailto:kovid@kovidgoyal.net">Kovid Goyal</a>.
+</p>
+
+<div id="planet_donate">
+    <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+        <input type="hidden" name="cmd" value="_s-xclick" />
+        <input type="hidden" name="hosted_button_id" value="3028915" />
+        <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="Donate to support calibre development" />
+        <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
+        <div>Donate to support the development of calibre.</div>
+    </form>
+</div>
+
+
+<div id="tags">
+    <ul id="cloud">
+    {% for tag in tagcloud %}
+      <li><a
+      {% if user_id %}
+      href="{{ site.url }}/user/{{ user_id }}/tag/{{ tag.tagname|urlencode }}/"
+      {% else %}
+      href="{{ site.url }}/tag/{{ tag.tagname|urlencode }}/"
+      {% endif %}
+      title="{{ tag.count }} posts"
+      class="cloud_{{ tag.weight }}">{{ tag.tagname }}</a></li>
+    {% endfor %}
+    </ul>
+</div>
+
+<div id='planet_ads' style="z-index:0">
+    <script type="text/javascript"><!--
+        google_ad_client = "pub-2595272032872519";
+        /* Calibre Planet */
+        google_ad_slot = "6940385240";
+        google_ad_width = 120;
+        google_ad_height = 600;
+        //-->
+    </script>
+    <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+    </script>
+    
+</div>
+
+
+<h4>Last update</h4>
+<b>{{ last_modified }}</b>
+
+<h4>People</h4>
+
+<ul class="suscriptores">
+{% for feed in subscribers %}
+<li>
+<a href="{{ feed.feed.feed_url }}"
+{% if feed.feed.last_modified %}
+title="feed (last modified: {{ feed.feed.last_modified }})"
+{% else %}
+title="feed"
+{% endif %}
+>
+<img src="{{ MEDIA_URL }}/img/feed.png" alt="feed"></a>
+<a class="nombre" href="{{ site.url }}/user/{{ feed.feed.id }}"
+title="{{ feed.feed.title }}">{{ feed.name }}</a></li>
+{% endfor %}
+</ul>
+
+
+</div>
+
+<div id="paginate">
+<ul>
+
+{% if has_previous %}
+<li><a href="?page={{ previous }}">&lt;&lt;</a></li>
+{% endif %}
+<li>
+  Page {{ page }} of {{ pages }} (
+    {{ hits }} posts
+  )
+</li>
+{% if has_next %}
+<li><a href="?page={{ next }}">&gt;&gt;</a></li>
+{% endif %}
+{% if user %}
+<li class="username"><a href="{{ user.feed.link }}">{{ user.name }}</a></li>
+{% endif %}
+{% if tag %}
+<li class="tagname">{{ tag.name }}</li>
+{% endif %}
+</ul>
+</div>
+
+<div style="height:50px">&nbsp;</div>
+
+
+{% endblock %}
diff --git a/src/calibre/www/templates/feedjack/foaf.xml b/src/calibre/www/templates/feedjack/foaf.xml
new file mode 100644
index 0000000000..1921e6e56f
--- /dev/null
+++ b/src/calibre/www/templates/feedjack/foaf.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<rdf:RDF
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+  xmlns:foaf="http://xmlns.com/foaf/0.1/"
+  xmlns:rss="http://purl.org/rss/1.0/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+<!-- based on http://www-128.ibm.com/developerworks/xml/library/x-pblog/ -->
+<foaf:Group>
+
+  <foaf:name>{{ site.title }}</foaf:name>
+  <foaf:homepage>{{ site.url }}</foaf:homepage>
+  <rdfs:seeAlso rdf:resource="{{ site.url }}/foaf/" />
+
+  {% for feed in feeds %}
+  <foaf:member>
+    <foaf:Person>
+      <foaf:name>{{ feed.name }}</foaf:name>
+      <foaf:weblog>
+        <foaf:Document rdf:about="{{ feed.link }}">
+          <dc:title>{{ feed.title }}</dc:title>
+          <rdfs:seeAlso>
+            <rss:channel rdf:about="{{ feed.feed_url }}" />
+          </rdfs:seeAlso>
+        </foaf:Document>
+      </foaf:weblog>
+    </foaf:Person>
+  </foaf:member>
+  {% endfor %}
+
+</foaf:Group>
+</rdf:RDF>
+
diff --git a/src/calibre/www/templates/feedjack/opml.xml b/src/calibre/www/templates/feedjack/opml.xml
new file mode 100644
index 0000000000..072763fb6f
--- /dev/null
+++ b/src/calibre/www/templates/feedjack/opml.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf8"?>
+<opml version="1.1">
+  <head>
+    <title>{{ site.title }}</title>
+  </head>
+  <body>
+    {% for feed in feeds %}
+      <outline type="rss" text="{{ feed.name }}" description="{{ feed.title }}" htmlUrl="{{ feed.link }}" xmlUrl="{{ feed.feed_url }}"/>
+    {% endfor %}
+  </body>
+</opml>
diff --git a/upload.py b/upload.py
index 001e34041a..814d124523 100644
--- a/upload.py
+++ b/upload.py
@@ -40,11 +40,11 @@ except:
         HOST=get_ip_address('wlan0')
     except:
         HOST='unknown'
-    
+
 def newer(targets, sources):
     '''
     Return True is sources is newer that targets or if targets
-    does not exist. 
+    does not exist.
     '''
     for f in targets:
         if not os.path.exists(f):
@@ -53,22 +53,22 @@ def newer(targets, sources):
     stimes = map(lambda x: os.stat(x).st_mtime, sources)
     newest_source, oldest_target = max(stimes), min(ttimes)
     return newest_source > oldest_target
- 
+
 
 class OptionlessCommand(Command):
     user_options = []
     def initialize_options(self): pass
     def finalize_options(self): pass
-    
+
     def run(self):
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
 
 
 class sdist(OptionlessCommand):
-    
+
     description = 'Create a source distribution using bzr'
-    
+
     def run(self):
         name = os.path.join('dist', '%s-%s.tar.gz'%(__appname__, __version__))
         check_call(('bzr export '+name).split())
@@ -77,9 +77,9 @@ class sdist(OptionlessCommand):
 
 class pot(OptionlessCommand):
     description = '''Create the .pot template for all translatable strings'''
-    
+
     PATH = os.path.join('src', __appname__, 'translations')
-    
+
     def source_files(self):
         ans = []
         for root, _, files in os.walk(os.path.dirname(self.PATH)):
@@ -88,7 +88,7 @@ class pot(OptionlessCommand):
                     ans.append(os.path.abspath(os.path.join(root, name)))
         return ans
 
-    
+
     def run(self):
         sys.path.insert(0, os.path.abspath(self.PATH))
         try:
@@ -109,7 +109,7 @@ class pot(OptionlessCommand):
             sys.path.remove(os.path.abspath(self.PATH))
 
 class manual(OptionlessCommand):
-    
+
     description='''Build the User Manual '''
 
     def run(self):
@@ -122,20 +122,20 @@ class manual(OptionlessCommand):
                 os.makedirs(d)
             if not os.path.exists('.build'+os.sep+'html'):
                 os.makedirs('.build'+os.sep+'html')
-            check_call(['sphinx-build', '-b', 'custom', '-d', 
+            check_call(['sphinx-build', '-b', 'custom', '-d',
                                    '.build/doctrees', '.', '.build/html'])
         finally:
             os.chdir(cwd)
-        
+
     @classmethod
     def clean(cls):
         path = os.path.join('src', 'calibre', 'manual', '.build')
         if os.path.exists(path):
             shutil.rmtree(path)
-        
+
 class resources(OptionlessCommand):
     description='''Compile various resource files used in calibre. '''
-    
+
     RESOURCES = dict(
         opf_template    = 'ebooks/metadata/opf.xml',
         ncx_template    = 'ebooks/metadata/ncx.xml',
@@ -145,9 +145,9 @@ class resources(OptionlessCommand):
         jquery_scrollTo = 'gui2/viewer/jquery_scrollTo.js',
         html_css        = 'ebooks/oeb/html.css',
     )
-    
+
     DEST = os.path.join('src', __appname__, 'resources.py')
-    
+
     def get_qt_translations(self):
         data = {}
         translations_found = False
@@ -162,7 +162,7 @@ class resources(OptionlessCommand):
         if not translations_found:
             print 'WARNING: Could not find Qt transations'
         return data
-    
+
     def get_static_resources(self):
         sdir = os.path.join('src', 'calibre', 'library', 'static')
         resources, max = {}, 0
@@ -171,7 +171,7 @@ class resources(OptionlessCommand):
             mtime = os.stat(os.path.join(sdir, f)).st_mtime
             max = mtime if mtime > max else max
         return resources, max
-    
+
     def get_recipes(self):
         sdir = os.path.join('src', 'calibre', 'web', 'feeds', 'recipes')
         resources, max = {}, 0
@@ -181,7 +181,7 @@ class resources(OptionlessCommand):
                 mtime = os.stat(os.path.join(sdir, f)).st_mtime
                 max = mtime if mtime > max else max
         return resources, max
-    
+
     def run(self):
         data, dest, RESOURCES = {}, self.DEST, self.RESOURCES
         for key in RESOURCES:
@@ -204,7 +204,7 @@ class resources(OptionlessCommand):
                 f.write('build_time = "%s"\n\n'%time.strftime('%d %m %Y %H%M%S'))
         else:
             print 'Resources are up to date'
-    
+
     @classmethod
     def clean(cls):
         path = cls.DEST
@@ -216,7 +216,7 @@ class translations(OptionlessCommand):
     description='''Compile the translations'''
     PATH = os.path.join('src', __appname__, 'translations')
     DEST = os.path.join(PATH, 'compiled.py')
-    
+
     def run(self):
         sys.path.insert(0, os.path.abspath(self.PATH))
         try:
@@ -236,21 +236,21 @@ class translations(OptionlessCommand):
                 print 'Translations up to date'
         finally:
             sys.path.remove(os.path.abspath(self.PATH))
-    
-            
+
+
     @classmethod
     def clean(cls):
         path = cls.DEST
         if os.path.exists(path):
             os.remove(path)
-        
+
 
 class gui(OptionlessCommand):
     description='''Compile all GUI forms and images'''
     PATH  = os.path.join('src', __appname__, 'gui2')
     IMAGES_DEST = os.path.join(PATH, 'images_rc.py')
     QRC = os.path.join(PATH, 'images.qrc')
-    
+
     @classmethod
     def find_forms(cls):
         forms = []
@@ -258,17 +258,17 @@ class gui(OptionlessCommand):
             for name in files:
                 if name.endswith('.ui'):
                     forms.append(os.path.abspath(os.path.join(root, name)))
-            
+
         return forms
-    
+
     @classmethod
     def form_to_compiled_form(cls, form):
         return form.rpartition('.')[0]+'_ui.py'
-    
+
     def run(self):
         self.build_forms()
         self.build_images()
-    
+
     def build_images(self):
         cwd, images = os.getcwd(), os.path.basename(self.IMAGES_DEST)
         try:
@@ -296,13 +296,13 @@ class gui(OptionlessCommand):
                 print 'Images are up to date'
         finally:
             os.chdir(cwd)
-        
-    
+
+
     def build_forms(self):
         from PyQt4.uic import compileUi
         forms = self.find_forms()
         for form in forms:
-            compiled_form = self.form_to_compiled_form(form) 
+            compiled_form = self.form_to_compiled_form(form)
             if not os.path.exists(compiled_form) or os.stat(form).st_mtime > os.stat(compiled_form).st_mtime:
                 print 'Compiling form', form
                 buf = cStringIO.StringIO()
@@ -313,21 +313,21 @@ class gui(OptionlessCommand):
                 dat = dat.replace('from library import', 'from calibre.gui2.library import')
                 dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
                 dat = re.compile(r'QtGui.QApplication.translate\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)
-                
+
                 # Workaround bug in Qt 4.4 on Windows
                 if form.endswith('dialogs%sconfig.ui'%os.sep) or form.endswith('dialogs%slrf_single.ui'%os.sep):
                     print 'Implementing Workaround for buggy pyuic in form', form
-                    dat = re.sub(r'= QtGui\.QTextEdit\(self\..*?\)', '= QtGui.QTextEdit()', dat) 
+                    dat = re.sub(r'= QtGui\.QTextEdit\(self\..*?\)', '= QtGui.QTextEdit()', dat)
                     dat = re.sub(r'= QtGui\.QListWidget\(self\..*?\)', '= QtGui.QListWidget()', dat)
-                
+
                 if form.endswith('viewer%smain.ui'%os.sep):
                     print 'Promoting WebView'
                     dat = dat.replace('self.view = QtWebKit.QWebView(', 'self.view = DocumentView(')
                     dat += '\n\nfrom calibre.gui2.viewer.documentview import DocumentView'
-                
+
                 open(compiled_form, 'wb').write(dat)
 
-            
+
     @classmethod
     def clean(cls):
         forms = cls.find_forms()
@@ -340,16 +340,16 @@ class gui(OptionlessCommand):
                 os.remove(x)
 
 class clean(OptionlessCommand):
-    
+
     description='''Delete all computer generated files in the source tree'''
-    
+
     def run(self):
         print 'Cleaning...'
         manual.clean()
         gui.clean()
         translations.clean()
         resources.clean()
-        
+
         for f in glob.glob(os.path.join('src', 'calibre', 'plugins', '*')):
             os.remove(f)
         for root, _, files in os.walk('.'):
@@ -358,12 +358,12 @@ class clean(OptionlessCommand):
                     if name.endswith(t):
                         os.remove(os.path.join(root, name))
                         break
-                    
+
         for dir in ('build', 'dist', os.path.join('src', 'calibre.egg-info')):
             shutil.rmtree(dir, ignore_errors=True)
 
 class build_py(_build_py):
-        
+
     def find_data_files(self, package, src_dir):
         """
         Return filenames for package's data files in 'src_dir'
@@ -377,11 +377,11 @@ class build_py(_build_py):
             pattern = os.path.join(src_dir, convert_path(pattern))
             next = glob.glob(pattern)
             files.extend(next if next else [pattern])
-            
+
         return self.exclude_data_files(package, src_dir, files)
 
 class build(_build):
-    
+
     sub_commands = [
                      ('resources',    lambda self : 'CALIBRE_BUILDBOT' not in os.environ.keys()),
                      ('translations', lambda self : 'CALIBRE_BUILDBOT' not in os.environ.keys()),
@@ -391,13 +391,13 @@ class build(_build):
                      ('build_clib',    _build.has_c_libraries),
                      ('build_scripts', _build.has_scripts),
                    ]
-     
+
 
 class update(OptionlessCommand):
-    
+
     description = 'Rebuild plugins and run develop. Should be called after ' +\
                   ' a version update.'
-    
+
     def run(self):
         for x in ['build', 'dist', 'docs'] + \
             glob.glob(os.path.join('src', 'calibre', 'plugins', '*')):
@@ -407,24 +407,24 @@ class update(OptionlessCommand):
                     os.mkdir(x)
                 else:
                     os.remove(x)
-        
+
         check_call('python setup.py build_ext build'.split())
         check_call('sudo python setup.py develop'.split())
-    
+
 class tag_release(OptionlessCommand):
-    
+
     description = 'Tag a new release in bzr'
-    
+
     def run(self):
         print 'Tagging release'
         check_call(('bzr tag '+__version__).split())
         check_call('bzr commit --unchanged -m'.split() + ['IGN:Tag release'])
-    
-    
+
+
 class upload_demo(OptionlessCommand):
-    
+
     description = 'Rebuild and upload various demos'
-    
+
     def run(self):
         check_call(
            '''html2lrf --title='Demonstration of html2lrf' --author='Kovid Goyal' '''
@@ -432,23 +432,23 @@ class upload_demo(OptionlessCommand):
            '''--serif-family "/usr/share/fonts/corefonts, Times New Roman" '''
            '''--mono-family  "/usr/share/fonts/corefonts, Andale Mono" '''
            ''''''%(HTML2LRF,), shell=True)
-        
+
         check_call(
             'cd src/calibre/ebooks/lrf/html/demo/ && '
             'zip -j /tmp/html-demo.zip * /tmp/html2lrf.lrf', shell=True)
-        
+
         check_call('scp /tmp/html-demo.zip divok:%s/'%(DOWNLOADS,), shell=True)
-        
+
         check_call(
            '''txt2lrf -t 'Demonstration of txt2lrf' -a 'Kovid Goyal' '''
            '''--header -o /tmp/txt2lrf.lrf %s/demo.txt'''%(TXT2LRF,), shell=True)
-        
+
         check_call('cd src/calibre/ebooks/lrf/txt/demo/ && '
                    'zip -j /tmp/txt-demo.zip * /tmp/txt2lrf.lrf', shell=True)
-        
+
         check_call('''scp /tmp/txt-demo.zip divok:%s/'''%(DOWNLOADS,), shell=True)
-        
-    
+
+
 def installer_name(ext):
     if ext in ('exe', 'dmg'):
         return 'dist/%s-%s.%s'%(__appname__, __version__, ext)
@@ -467,14 +467,14 @@ class build_linux(OptionlessCommand):
         return os.path.basename(installer)
 
 class VMInstaller(OptionlessCommand):
-    
+
     user_options = [('dont-shutdown', 'd', 'Dont shutdown Vm after build')]
     boolean_options = ['dont-shutdown']
-    
+
     def initialize_options(self):
         self.dont_shutdown = False
-    
-    BUILD_SCRIPT = textwrap.dedent('''\     
+
+    BUILD_SCRIPT = textwrap.dedent('''\
         #!/bin/bash
         export CALIBRE_BUILDBOT=1
         cd ~/build && \
@@ -488,10 +488,10 @@ class VMInstaller(OptionlessCommand):
         rm -rf build/* dist/* && \
         %%s %%s
         '''%dict(host=HOST, project=__appname__))
-    
+
     def get_build_script(self, subs):
         return self.BUILD_SCRIPT%subs
-    
+
     def start_vm(self, ssh_host, build_script, sleep=75):
         build_script = self.get_build_script(build_script)
         vmware = ('vmware', '-q', '-x', '-n', self.VM)
@@ -500,7 +500,7 @@ class VMInstaller(OptionlessCommand):
         t.write(build_script)
         t.flush()
         print 'Waiting for VM to startup'
-        while call('ping -q -c1 '+ssh_host, shell=True, 
+        while call('ping -q -c1 '+ssh_host, shell=True,
                    stdout=open('/dev/null', 'w')) != 0:
             time.sleep(5)
         time.sleep(20)
@@ -513,10 +513,10 @@ class build_windows(VMInstaller):
     VM = '/mnt/backup/calibre_windows_xp_home/calibre_windows_xp_home.vmx'
     if not os.path.exists(VM):
         VM = '/home/kovid/calibre_windows_xp_home/calibre_windows_xp_home.vmx'
-    
+
     def run(self):
         installer = installer_name('exe')
-        self.start_vm('windows', ('python setup.py develop', 
+        self.start_vm('windows', ('python setup.py develop',
                                   'python',
                                   r'installer\\windows\\freeze.py'))
         if os.path.exists('build/py2exe'):
@@ -529,7 +529,7 @@ class build_windows(VMInstaller):
             Popen(('ssh', 'windows', 'shutdown', '-s', '-t', '0'))
         self.run_windows_install_jammer(installer)
         return os.path.basename(installer)
-    
+
     def run_windows_install_jammer(self, installer):
         ibp = os.path.abspath('installer/windows')
         sys.path.insert(0, ibp)
@@ -546,14 +546,14 @@ class build_osx(VMInstaller):
     VM = '/vmware/Mac OSX/Mac OSX.vmx'
     if not os.path.exists(VM):
         VM = '/home/kovid/calibre_os_x/Mac OSX.vmx'
-    
+
     def get_build_script(self, subs):
         return (self.BUILD_SCRIPT%subs).replace('rm ', 'sudo rm ')
-    
+
     def run(self):
         installer = installer_name('dmg')
         python = '/Library/Frameworks/Python.framework/Versions/Current/bin/python'
-        self.start_vm('osx', ('sudo %s setup.py develop'%python, python, 
+        self.start_vm('osx', ('sudo %s setup.py develop'%python, python,
                               'installer/osx/freeze.py'))
         check_call(('scp', 'osx:build/calibre/dist/*.dmg', 'dist'))
         if not os.path.exists(installer):
@@ -579,7 +579,7 @@ class upload_installers(OptionlessCommand):
         c.perform()
         c.close()
         return b.getvalue().split() if listonly else b.getvalue().splitlines()
-    
+
     def curl_delete_file(self, path, url=MOBILEREAD):
         import pycurl
         c = pycurl.Curl()
@@ -590,8 +590,8 @@ class upload_installers(OptionlessCommand):
         c.setopt(c.QUOTE, ['dele '+ path])
         c.perform()
         c.close()
-    
-    
+
+
     def curl_upload_file(self, stream, url):
         import pycurl
         c = pycurl.Curl()
@@ -618,7 +618,7 @@ class upload_installers(OptionlessCommand):
                 stream.seek(0,2)
                 if size != stream.tell():
                     raise RuntimeError('curl failed to upload %s correctly'%getattr(stream, 'name', ''))
-    
+
     def upload_installer(self, name):
         if not os.path.exists(name):
             return
@@ -633,32 +633,27 @@ class upload_installers(OptionlessCommand):
         print 'Uploading installers...'
         for i in ('dmg', 'exe', 'tar.bz2'):
             self.upload_installer(installer_name(i))
-    
+
         check_call('''ssh divok echo %s \\> %s/latest_version'''\
                    %(__version__, DOWNLOADS), shell=True)
 
 class upload_user_manual(OptionlessCommand):
     description = 'Build and upload the User Manual'
     sub_commands = [('manual', None)]
-    
+
     def run(self):
         OptionlessCommand.run(self)
         check_call(' '.join(['scp', '-r', 'src/calibre/manual/.build/html/*',
                     'divok:%s'%USER_MANUAL]), shell=True)
-        
+
 class upload_to_pypi(OptionlessCommand):
     description = 'Upload eggs and source to PyPI'
     def run(self):
         check_call('python setup.py register'.split())
         check_call('rm -f dist/*', shell=True)
-        check_call('sudo rm -rf build src/calibre/plugins/*', shell=True)
-        os.mkdir('build')
-        check_call('python2.5 setup.py build_ext bdist_egg --exclude-source-files upload'.split())
-        check_call('sudo rm -rf build src/calibre/plugins/*', shell=True)
-        os.mkdir('build')
         check_call('python setup.py build_ext bdist_egg --exclude-source-files upload'.split())
         check_call('python setup.py sdist upload'.split())
-        
+
 class stage3(OptionlessCommand):
     description = 'Stage 3 of the build process'
     sub_commands = [
@@ -667,7 +662,7 @@ class stage3(OptionlessCommand):
                     ('upload_to_pypi', None),
                     ('upload_rss', None),
                     ]
-    
+
     @classmethod
     def misc(cls):
         check_call('ssh divok rm -f %s/calibre-\*.tar.gz'%DOWNLOADS, shell=True)
@@ -675,23 +670,23 @@ class stage3(OptionlessCommand):
         check_call('''rm -rf dist/* build/*''', shell=True)
         check_call('ssh divok bzr update /var/www/calibre.kovidgoyal.net/calibre/',
                    shell=True)
-    
+
     def run(self):
         OptionlessCommand.run(self)
         self.misc()
-        
+
 class stage2(OptionlessCommand):
-    description = 'Stage 2 of the build process' 
+    description = 'Stage 2 of the build process'
     sub_commands = [
                     ('build_linux', None),
                     ('build_windows', None),
                     ('build_osx', None)
                     ]
-    
+
     def run(self):
         check_call('rm -rf dist/*', shell=True)
         OptionlessCommand.run(self)
-        
+
 class stage1(OptionlessCommand):
     description = 'Stage 1 of the build process'
     sub_commands = [
@@ -699,10 +694,10 @@ class stage1(OptionlessCommand):
                 ('tag_release', None),
                 ('upload_demo', None),
                 ]
-    
+
 class upload(OptionlessCommand):
     description = 'Build and upload calibre to the servers'
-    
+
     sub_commands = [
             ('stage1', None),
             ('stage2', None),
@@ -711,13 +706,13 @@ class upload(OptionlessCommand):
 
 try:
     class upload_rss(OptionlessCommand):
-    
+
         from bzrlib import log as blog
-            
+
         class ChangelogFormatter(blog.LogFormatter):
             supports_tags = True
             supports_merge_revisions = False
-            
+
             def __init__(self, num_of_versions=20):
                 from calibre.utils.rss_gen import RSS2
                 self.num_of_versions = num_of_versions
@@ -727,21 +722,21 @@ try:
                                 description = 'Latest release of calibre',
                                 lastBuildDate = datetime.utcnow()
                                 )
-                self.current_entry = None 
-                
+                self.current_entry = None
+
             def log_revision(self, r):
                 from calibre.utils.rss_gen import RSSItem, Guid
                 if len(self.rss.items) > self.num_of_versions-1:
                     return
                 msg = r.rev.message
                 match = re.match(r'version\s+(\d+\.\d+.\d+)', msg)
-                 
+
                 if match:
                     if self.current_entry is not None:
                         mkup = '<div><ul>%s</ul></div>'
                         self.current_entry.description = mkup%(''.join(
                                     self.current_entry.description))
-                        
+
                         self.rss.items.append(self.current_entry)
                     timestamp = r.rev.timezone + r.rev.timestamp
                     self.current_entry = RSSItem(
@@ -755,13 +750,13 @@ try:
                     if re.search(r'[a-zA-Z]', msg) and len(msg.strip()) > 5:
                         if 'translation' not in msg and not msg.startswith('IGN'):
                             msg = msg.replace('<', '&lt;').replace('>', '&gt;')
-                            msg = re.sub('#(\d+)', r'<a href="http://calibre.kovidgoyal.net/ticket/\1">#\1</a>', 
+                            msg = re.sub('#(\d+)', r'<a href="http://calibre.kovidgoyal.net/ticket/\1">#\1</a>',
                                          msg)
-                            
+
                             self.current_entry.description.append(
                                             '<li>%s</li>'%msg.strip())
-         
-            
+
+
         def run(self):
             from bzrlib import log, branch
             bzr_path = os.path.expanduser('~/work/calibre')
@@ -771,5 +766,5 @@ try:
             lf.rss.write_xml(open('/tmp/releases.xml', 'wb'))
             subprocess.check_call('scp /tmp/releases.xml divok:/var/www/calibre.kovidgoyal.net/htdocs/downloads'.split())
 except ImportError:
-    upload_rss = None         
+    upload_rss = None