diff --git a/README.md b/README.md
index 25ed59bb..1141288f 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 - full graphical setup
 - User management with fine-grained per-user permissions
 - Admin interface
-- User Interface in czech, dutch, english, finnish, french, german, hungarian, italian, japanese, khmer, polish, russian, simplified chinese, spanish, swedish, turkish, ukrainian
+- User Interface in czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, polish, russian, simplified chinese, spanish, swedish, turkish, ukrainian
 - OPDS feed for eBook reader apps 
 - Filter and search by titles, authors, tags, series and language
 - Create a custom book collection (shelves)
diff --git a/cps/admin.py b/cps/admin.py
index ebe2fdff..c0d1f39c 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -799,7 +799,7 @@ def _handle_new_user(to_save, content,languages, translations, kobo_support):
         flash(_(u"Settings DB is not Writeable"), category="error")
 
 
-def _handle_edit_user(to_save, content,languages, translations, kobo_support, downloads):
+def _handle_edit_user(to_save, content,languages, translations, kobo_support):
     if "delete" in to_save:
         if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
                                             ub.User.id != content.id).count():
@@ -858,7 +858,6 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support, do
                                              kobo_support=kobo_support,
                                              new_user=0,
                                              content=content,
-                                             downloads=downloads,
                                              registered_oauth=oauth_check,
                                              title=_(u"Edit User %(nick)s", nick=content.nickname), page="edituser")
         if "nickname" in to_save and to_save["nickname"] != content.nickname:
@@ -872,7 +871,6 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support, do
                                              languages=languages,
                                              mail_configured=config.get_mail_server_configured(),
                                              new_user=0, content=content,
-                                             downloads=downloads,
                                              registered_oauth=oauth_check,
                                              kobo_support=kobo_support,
                                              title=_(u"Edit User %(nick)s", nick=content.nickname),
@@ -961,28 +959,20 @@ def update_mailsettings():
 @admin_required
 def edit_user(user_id):
     content = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()  # type: ub.User
-    if not content:
+    if not content or (not config.config_anonbrowse and content.nickname == "Guest"):
         flash(_(u"User not found"), category="error")
         return redirect(url_for('admin.admin'))
-    downloads = list()
     languages = calibre_db.speaking_language()
     translations = babel.list_translations() + [LC('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    for book in content.downloads:
-        downloadbook = calibre_db.get_book(book.book_id)
-        if downloadbook:
-            downloads.append(downloadbook)
-        else:
-            ub.delete_download(book.book_id)
     if request.method == "POST":
         to_save = request.form.to_dict()
-        _handle_edit_user(to_save, content, languages, translations, kobo_support, downloads)
+        _handle_edit_user(to_save, content, languages, translations, kobo_support)
     return render_title_template("user_edit.html",
                                  translations=translations,
                                  languages=languages,
                                  new_user=0,
                                  content=content,
-                                 downloads=downloads,
                                  registered_oauth=oauth_check,
                                  mail_configured=config.get_mail_server_configured(),
                                  kobo_support=kobo_support,
@@ -1039,7 +1029,8 @@ def send_logfile(logtype):
 
 
 @admi.route("/get_update_status", methods=['GET'])
-@login_required_if_no_ano
+@login_required
+@admin_required
 def get_update_status():
     log.info(u"Update status requested")
     return updater_thread.get_available_updates(request.method, locale=get_locale())
diff --git a/cps/config_sql.py b/cps/config_sql.py
index d5c7b213..9dcb4528 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -19,7 +19,6 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
-import json
 import sys
 
 from sqlalchemy import exc, Column, String, Integer, SmallInteger, Boolean, BLOB, JSON
diff --git a/cps/converter.py b/cps/converter.py
index 01a6fbc7..2ff73666 100644
--- a/cps/converter.py
+++ b/cps/converter.py
@@ -19,7 +19,6 @@
 from __future__ import division, print_function, unicode_literals
 import os
 import re
-import sys
 from flask_babel import gettext as _
 
 from . import config, logger
diff --git a/cps/db.py b/cps/db.py
index b2ab257a..f648a794 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -147,7 +147,7 @@ class Identifiers(Base):
         elif format_type == "kobo":
             return u"https://www.kobo.com/ebook/{0}".format(self.val)
         elif format_type == "lubimyczytac":
-            return u" https://lubimyczytac.pl/ksiazka/{0}/ksiazka".format(self.val)
+            return u"https://lubimyczytac.pl/ksiazka/{0}/ksiazka".format(self.val)
         elif format_type == "litres":
             return u"https://www.litres.ru/{0}".format(self.val)
         elif format_type == "issn":
@@ -687,9 +687,7 @@ class CalibreDB():
             limit_all = result_count
 
         ub.store_ids(result)
-
-
-        return result[offset:limit_all], result_count, pagination,
+        return result[offset:limit_all], result_count, pagination
 
     # Creates for all stored languages a translated speaking name in the array for the UI
     def speaking_language(self, languages=None):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 7f7764e5..f2e52af4 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -27,7 +27,6 @@ import json
 from shutil import copyfile
 from uuid import uuid4
 
-from babel import Locale as LC
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
@@ -930,6 +929,7 @@ def convert_bookformat(book_id):
 
 @editbook.route("/ajax/editbooks/<param>", methods=['POST'])
 @login_required_if_no_ano
+@edit_required
 def edit_list_book(param):
     vals = request.form.to_dict()
     # calibre_db.update_title_sort(config)
@@ -989,6 +989,7 @@ def get_sorted_entry(field, bookid):
 
 @editbook.route("/ajax/simulatemerge", methods=['POST'])
 @login_required
+@edit_required
 def simulate_merge_list_book():
     vals = request.get_json().get('Merge_books')
     if vals:
@@ -1004,6 +1005,7 @@ def simulate_merge_list_book():
 
 @editbook.route("/ajax/mergebooks", methods=['POST'])
 @login_required
+@edit_required
 def merge_list_book():
     vals = request.get_json().get('Merge_books')
     to_file = list()
diff --git a/cps/gdrive.py b/cps/gdrive.py
index 74a45061..584c90cf 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -123,38 +123,36 @@ def revoke_watch_gdrive():
 
 @gdrive.route("/gdrive/watch/callback", methods=['GET', 'POST'])
 def on_received_watch_confirmation():
+    if request.headers.get('X-Goog-Channel-Token') != gdrive_watch_callback_token \
+            or request.headers.get('X-Goog-Resource-State') != 'change' \
+            or not request.data:
+        return redirect(url_for('admin.configuration'))
+
     log.debug('%r', request.headers)
-    if request.headers.get('X-Goog-Channel-Token') == gdrive_watch_callback_token \
-            and request.headers.get('X-Goog-Resource-State') == 'change' \
-            and request.data:
+    log.debug('%r', request.data)
+    log.info('Change received from gdrive')
 
-        data = request.data
-
-        def updateMetaData():
-            log.info('Change received from gdrive')
-            log.debug('%r', data)
-            try:
-                j = json.loads(data)
-                log.info('Getting change details')
-                response = gdriveutils.getChangeById(gdriveutils.Gdrive.Instance().drive, j['id'])
-                log.debug('%r', response)
-                if response:
-                    if sys.version_info < (3, 0):
-                        dbpath = os.path.join(config.config_calibre_dir, "metadata.db")
-                    else:
-                        dbpath = os.path.join(config.config_calibre_dir, "metadata.db").encode()
-                    if not response['deleted'] and response['file']['title'] == 'metadata.db' \
-                       and response['file']['md5Checksum'] != hashlib.md5(dbpath):
-                        tmpDir = tempfile.gettempdir()
-                        log.info('Database file updated')
-                        copyfile(dbpath, os.path.join(tmpDir, "metadata.db_" + str(current_milli_time())))
-                        log.info('Backing up existing and downloading updated metadata.db')
-                        gdriveutils.downloadFile(None, "metadata.db", os.path.join(tmpDir, "tmp_metadata.db"))
-                        log.info('Setting up new DB')
-                        # prevent error on windows, as os.rename does on exisiting files
-                        move(os.path.join(tmpDir, "tmp_metadata.db"), dbpath)
-                        calibre_db.reconnect_db(config, ub.app_DB_path)
-            except Exception as e:
-                log.exception(e)
-        updateMetaData()
+    try:
+        j = json.loads(request.data)
+        log.info('Getting change details')
+        response = gdriveutils.getChangeById(gdriveutils.Gdrive.Instance().drive, j['id'])
+        log.debug('%r', response)
+        if response:
+            if sys.version_info < (3, 0):
+                dbpath = os.path.join(config.config_calibre_dir, "metadata.db")
+            else:
+                dbpath = os.path.join(config.config_calibre_dir, "metadata.db").encode()
+            if not response['deleted'] and response['file']['title'] == 'metadata.db' \
+                and response['file']['md5Checksum'] != hashlib.md5(dbpath):
+                tmpDir = tempfile.gettempdir()
+                log.info('Database file updated')
+                copyfile(dbpath, os.path.join(tmpDir, "metadata.db_" + str(current_milli_time())))
+                log.info('Backing up existing and downloading updated metadata.db')
+                gdriveutils.downloadFile(None, "metadata.db", os.path.join(tmpDir, "tmp_metadata.db"))
+                log.info('Setting up new DB')
+                # prevent error on windows, as os.rename does on exisiting files
+                move(os.path.join(tmpDir, "tmp_metadata.db"), dbpath)
+                calibre_db.reconnect_db(config, ub.app_DB_path)
+    except Exception as e:
+        log.exception(e)
     return ''
diff --git a/cps/helper.py b/cps/helper.py
index f946a039..8561a95a 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -35,7 +35,7 @@ from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_login import current_user
-from sqlalchemy.sql.expression import true, false, and_, text, func
+from sqlalchemy.sql.expression import true, false, and_, text
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from . import calibre_db
@@ -373,23 +373,26 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         new_name = get_valid_filename(localbook.title) + ' - ' + get_valid_filename(new_authordir)
         try:
             if orignal_filepath:
-                os.renames(os.path.normcase(path),
-                           os.path.normcase(os.path.join(new_path, db_filename)))
+                if not os.path.isdir(new_path):
+                    os.makedirs(new_path)
+                shutil.move(os.path.normcase(path), os.path.normcase(os.path.join(new_path, db_filename)))
                 log.debug("Moving title: %s to %s/%s", path, new_path, new_name)
-            # Check new path is not valid path
-            elif not os.path.exists(new_path):
-                # move original path to new path
-                os.renames(os.path.normcase(path), os.path.normcase(new_path))
-                log.debug("Moving title: %s to %s", path, new_path)
-            else: # path is valid copy only files to new location (merge)
-                log.info("Moving title: %s into existing: %s", path, new_path)
-                # Take all files and subfolder from old path (strange command)
-                for dir_name, __, file_list in os.walk(path):
-                    for file in file_list:
-                        os.renames(os.path.normcase(os.path.join(dir_name, file)),
-                                   os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
+                # Check new path is not valid path
+            else:
+                if not os.path.exists(new_path):
+                    # move original path to new path
+                    log.debug("Moving title: %s to %s", path, new_path)
+                    shutil.move(os.path.normcase(path), os.path.normcase(new_path))
+                else: # path is valid copy only files to new location (merge)
+                    log.info("Moving title: %s into existing: %s", path, new_path)
+                    # Take all files and subfolder from old path (strange command)
+                    for dir_name, __, file_list in os.walk(path):
+                        for file in file_list:
+                            shutil.move(os.path.normcase(os.path.join(dir_name, file)),
+                                            os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
+                            # os.unlink(os.path.normcase(os.path.join(dir_name, file)))
             # change location in database to new author/title path
-            localbook.path = os.path.join(new_authordir, new_titledir)
+            localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/')
         except OSError as ex:
             log.error("Rename title from: %s to %s: %s", path, new_path, ex)
             log.debug(ex, exc_info=True)
@@ -399,10 +402,12 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         # Rename all files from old names to new names
         try:
             for file_format in localbook.data:
-                os.renames(os.path.normcase(
+                shutil.move(os.path.normcase(
                     os.path.join(new_path, file_format.name + '.' + file_format.format.lower())),
-                           os.path.normcase(os.path.join(new_path, new_name + '.' + file_format.format.lower())))
+                    os.path.normcase(os.path.join(new_path, new_name + '.' + file_format.format.lower())))
                 file_format.name = new_name
+            if not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+                shutil.rmtree(os.path.dirname(path))
         except OSError as ex:
             log.error("Rename file in path %s to %s: %s", new_path, new_name, ex)
             log.debug(ex, exc_info=True)
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 2e6ec680..52e50667 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -434,6 +434,379 @@ LANGUAGE_NAMES = {
         "zxx": "brak kontekstu językowego",
         "zza": "zazaki"
     },
+    "el": {
+        "abk": "Αμπχαζιανά",
+        "ace": "Ατσενέζικα",
+        "ach": "Ακόλο",
+        "ada": "Αντάνγκμε",
+        "ady": "Αντύγκε",
+        "aar": "Αφάρ",
+        "afh": "Αφριχίλι",
+        "afr": "Αφρικάανς",
+        "ain": "Αϊνού (Ιαπωνία)",
+        "aka": "Ακάν",
+        "akk": "Akkadian",
+        "sqi": "Αλβανικά",
+        "ale": "Aleut",
+        "amh": "Amharic",
+        "anp": "Angika",
+        "ara": "Αραβικά",
+        "arg": "Αραγωνικά ",
+        "arp": "Αραπάχο",
+        "arw": "Arawak",
+        "hye": "Αρμένικα",
+        "asm": "Assamese",
+        "ast": "Asturian",
+        "ava": "Αβαρικά",
+        "ave": "Avestan",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Αζερμπαϊτζιανά",
+        "ban": "Balinese",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "bas": "Basa (Cameroon)",
+        "bak": "Bashkir",
+        "eus": "Βασκικά",
+        "bej": "Beja",
+        "bel": "Λευκωρωσικά",
+        "bem": "Bemba (Zambia)",
+        "ben": "Μπενγκάλι",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "byn": "Bilin",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "zbl": "Blissymbols",
+        "bos": "Βοσνιακά",
+        "bra": "Braj",
+        "bre": "Βρετονικά",
+        "bug": "Buginese",
+        "bul": "Βουλγάρικα",
+        "bua": "Buriat",
+        "mya": "Burmese",
+        "cad": "Caddo",
+        "cat": "Καταλανικά",
+        "ceb": "Cebuano",
+        "chg": "Chagatai",
+        "cha": "Chamorro",
+        "che": "Τσετσενικά",
+        "chr": "Cherokee",
+        "chy": "Cheyenne",
+        "chb": "Chibcha",
+        "zho": "Κινέζικα",
+        "chn": "Chinook jargon",
+        "chp": "Chipewyan",
+        "cho": "Choctaw",
+        "chk": "Chuukese",
+        "chv": "Chuvash",
+        "cop": "Κοπτικά",
+        "cor": "Cornish",
+        "cos": "Κορσικανικά",
+        "cre": "Cree",
+        "mus": "Creek",
+        "hrv": "Κροατικά",
+        "ces": "Τσέχικα",
+        "dak": "Dakota",
+        "dan": "Δανέζικα",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "div": "Dhivehi",
+        "din": "Dinka",
+        "doi": "Dogri (macrolanguage)",
+        "dgr": "Dogrib",
+        "dua": "Duala",
+        "nld": "Ολλανδικά",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efik",
+        "egy": "Αρχαία Αιγυπτιακά",
+        "eka": "Ekajuk",
+        "elx": "Elamite",
+        "eng": "Αγγλικά",
+        "myv": "Erzya",
+        "epo": "Εσπεράντο",
+        "est": "Εσθονικά",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fat": "Fanti",
+        "fao": "Faroese",
+        "fij": "Fijian",
+        "fil": "Filipino",
+        "fin": "Φινλανδικά",
+        "fon": "Fon",
+        "fra": "Γαλλικά",
+        "fur": "Friulian",
+        "ful": "Fulah",
+        "gaa": "Ga",
+        "glg": "Galician",
+        "lug": "Ganda",
+        "gay": "Gayo",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "Geez",
+        "kat": "Γεωργιανά",
+        "deu": "Γερμανικά",
+        "gil": "Gilbertese",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "Γοτθικά",
+        "grb": "Grebo",
+        "grn": "Guarani",
+        "guj": "Gujarati",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hau": "Hausa",
+        "haw": "Hawaiian",
+        "heb": "Εβραϊκά",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "Ινδικά",
+        "hmo": "Hiri Motu",
+        "hit": "Hittite",
+        "hmn": "Hmong",
+        "hun": "Ουγγρικά",
+        "hup": "Hupa",
+        "iba": "Iban",
+        "isl": "Ισλανδικά",
+        "ido": "Ido",
+        "ibo": "Igbo",
+        "ilo": "Iloko",
+        "ind": "Ινδονησιακά",
+        "inh": "Ingush",
+        "ina": "Interlingua (International Auxiliary Language Association)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiaq",
+        "gle": "Ιρλανδέζικα",
+        "ita": "Ιταλικά",
+        "jpn": "Γιαπωνέζικα",
+        "jav": "Javanese",
+        "jrb": "Judeo-Arabic",
+        "jpr": "Judeo-Persian",
+        "kbd": "Kabardian",
+        "kab": "Kabyle",
+        "kac": "Kachin",
+        "kal": "Kalaallisut",
+        "xal": "Kalmyk",
+        "kam": "Kamba (Kenya)",
+        "kan": "Kannada",
+        "kau": "Kanuri",
+        "kaa": "Kara-Kalpak",
+        "krc": "Karachay-Balkar",
+        "krl": "Karelian",
+        "kas": "Kashmiri",
+        "csb": "Kashubian",
+        "kaw": "Kawi",
+        "kaz": "Kazakh",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirghiz",
+        "tlh": "Κλίγκον",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kok": "Konkani (macrolanguage)",
+        "kor": "Κορεάτικα",
+        "kos": "Kosraean",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "Κουρδικά",
+        "kru": "Kurukh",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "Lao",
+        "lat": "Λατινικά",
+        "lav": "Λετονέζικα",
+        "lez": "Lezghian",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "Λιθουανικά",
+        "jbo": "Lojban",
+        "loz": "Lozi",
+        "lub": "Luba-Katanga",
+        "lua": "Luba-Lulua",
+        "lui": "Luiseno",
+        "smj": "Lule Sami",
+        "lun": "Lunda",
+        "luo": "Luo (Kenya and Tanzania)",
+        "lus": "Lushai",
+        "ltz": "Luxembourgish",
+        "mkd": "Σλαβομακεδονικά",
+        "mad": "Madurese",
+        "mag": "Magahi",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mlg": "Malagasy",
+        "msa": "Malay (macrolanguage)",
+        "mal": "Malayalam",
+        "mlt": "Maltese",
+        "mnc": "Manchu",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri",
+        "glv": "Manx",
+        "mri": "Maori",
+        "arn": "Mapudungun",
+        "mar": "Marathi",
+        "chm": "Mari (Russia)",
+        "mah": "Marshallese",
+        "mwr": "Marwari",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mwl": "Mirandese",
+        "moh": "Mohawk",
+        "mdf": "Moksha",
+        "lol": "Mongo",
+        "mon": "Μογγολικά",
+        "mos": "Mossi",
+        "mul": "Πολλαπλές γλώσσες",
+        "nqo": "N'Ko",
+        "nau": "Nauru",
+        "nav": "Navajo",
+        "ndo": "Ndonga",
+        "nap": "Neapolitan",
+        "nia": "Nias",
+        "niu": "Niuean",
+        "zxx": "Χωρίς γλωσσολογικό περιεχόμενο",
+        "nog": "Nogai",
+        "nor": "Νορβηγικά",
+        "nob": "Norwegian Bokmål",
+        "nno": "Νορβηγικά Nynorsk",
+        "nym": "Nyamwezi",
+        "nya": "Nyanja",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Ossetian",
+        "pal": "Pahlavi",
+        "pau": "Palauan",
+        "pli": "Pali",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Panjabi",
+        "pap": "Papiamento",
+        "fas": "Περσικά",
+        "phn": "Φοινικικά",
+        "pon": "Pohnpeian",
+        "pol": "Πολωνέζικα",
+        "por": "Πορτογαλικά",
+        "pus": "Pashto",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "ron": "Ρουμάνικα",
+        "roh": "Romansh",
+        "rom": "Romany",
+        "run": "Rundi",
+        "rus": "Ρώσικα",
+        "smo": "Samoan",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "san": "Σανσκριτικά",
+        "sat": "Santali",
+        "srd": "Sardinian",
+        "sas": "Sasak",
+        "sco": "Σκωτσέζικα",
+        "sel": "Selkup",
+        "srp": "Σερβικά",
+        "srr": "Serer",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Sicilian",
+        "sid": "Sidamo",
+        "bla": "Siksika",
+        "snd": "Sindhi",
+        "sin": "Sinhala",
+        "den": "Slave (Athapascan)",
+        "slk": "Σλοβακικά",
+        "slv": "Σλοβενικά",
+        "sog": "Σογδιανά",
+        "som": "Σομαλικά",
+        "snk": "Soninke",
+        "spa": "Ισπανικά",
+        "srn": "Sranan Tongo",
+        "suk": "Sukuma",
+        "sux": "Sumerian",
+        "sun": "Sundanese",
+        "sus": "Susu",
+        "swa": "Swahili (macrolanguage)",
+        "ssw": "Swati",
+        "swe": "Σουηδικά",
+        "syr": "Συριακά",
+        "tgl": "Tagalog",
+        "tah": "Tahitian",
+        "tgk": "Tajik",
+        "tmh": "Tamashek",
+        "tam": "Ταμίλ",
+        "tat": "Tatar",
+        "tel": "Telugu",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tha": "Ταϊλανδέζικη",
+        "bod": "Θιβετιανά",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tem": "Timne",
+        "tiv": "Tiv",
+        "tli": "Tlingit",
+        "tpi": "Tok Pisin",
+        "tkl": "Τοκελάου",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga Islands)",
+        "tsi": "Tsimshian",
+        "tso": "Tsonga",
+        "tsn": "Tswana",
+        "tum": "Tumbuka",
+        "tur": "Τουρκικά",
+        "tuk": "Τουρκμένικα",
+        "tvl": "Tuvalu",
+        "tyv": "Tuvinian",
+        "twi": "Twi",
+        "udm": "Udmurt",
+        "uga": "Ugaritic",
+        "uig": "Uighur",
+        "ukr": "Ουκρανικά",
+        "umb": "Umbundu",
+        "mis": "Uncoded languages",
+        "und": "Απροσδιόριστη",
+        "urd": "Urdu",
+        "uzb": "Uzbek",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Βιετναμέζικα",
+        "vol": "Volapük",
+        "vot": "Votic",
+        "wln": "Walloon",
+        "war": "Waray (Philippines)",
+        "was": "Washo",
+        "cym": "Ουαλικά",
+        "wal": "Wolaytta",
+        "wol": "Wolof",
+        "xho": "Xhosa",
+        "sah": "Yakut",
+        "yao": "Yao",
+        "yap": "Yapese",
+        "yid": "Yiddish",
+        "yor": "Yoruba",
+        "zap": "Zapotec",
+        "zza": "Zaza",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zul": "Zulu",
+        "zun": "Zuni"
+    },
     "nl": {
         "aar": "Afar; Hamitisch",
         "abk": "Abchazisch",
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 87ba4159..ebb53a30 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -25,7 +25,6 @@
 from __future__ import division, print_function, unicode_literals
 import datetime
 import mimetypes
-import re
 
 from babel.dates import format_date
 from flask import Blueprint, request, url_for
@@ -110,9 +109,21 @@ def timestamptodate(date, fmt=None):
 def yesno(value, yes, no):
     return yes if value else no
 
+
 @jinjia.app_template_filter('formatfloat')
 def formatfloat(value, decimals=1):
     formatedstring = '%d' % value
     if (value % 1) != 0:
         formatedstring = ('%s.%d' % (formatedstring, (value % 1) * 10**decimals)).rstrip('0')
     return formatedstring
+
+
+@jinjia.app_template_filter('formatseriesindex')
+def formatseriesindex_filter(series_index):
+    if series_index:
+        if int(series_index) - series_index == 0:
+            return int(series_index)
+        else:
+            return series_index
+    return 0
+
diff --git a/cps/kobo.py b/cps/kobo.py
index a6dfc3f6..7a05ea5d 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -39,7 +39,7 @@ from flask import (
     redirect,
     abort
 )
-from flask_login import current_user, login_required
+from flask_login import current_user
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
 from sqlalchemy.sql.expression import and_, or_
diff --git a/cps/opds.py b/cps/opds.py
index ac0e103b..1eb3c49f 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -408,7 +408,7 @@ def get_metadata_calibre_companion(uuid, library):
 
 def feed_search(term):
     if term:
-        entries, __ = calibre_db.get_search_results(term)
+        entries, __, ___ = calibre_db.get_search_results(term)
         entriescount = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entriescount, entriescount)
         return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
diff --git a/cps/server.py b/cps/server.py
index de98fc6e..b2d9c1b0 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -150,7 +150,7 @@ class WebServer(object):
                 def my_wrap_socket(*args, **kwargs):
                     try:
                         return wrap_socket(*args, **kwargs)
-                    except (ssl.SSLError) as ex:
+                    except (ssl.SSLError, OSError) as ex:
                         log.warning('Gevent SSL Error: %s', ex)
                         raise GreenletExit
 
diff --git a/cps/services/goodreads_support.py b/cps/services/goodreads_support.py
index 58255f3c..9312bc0f 100644
--- a/cps/services/goodreads_support.py
+++ b/cps/services/goodreads_support.py
@@ -72,7 +72,7 @@ def get_author_info(author_name):
         author_info = _client.find_author(author_name=author_name)
     except Exception as ex:
         # Skip goodreads, if site is down/inaccessible
-        log.warning('Goodreads website is down/inaccessible? %s', ex)
+        log.warning('Goodreads website is down/inaccessible? %s', ex.__str__())
         return
 
     if author_info:
diff --git a/cps/static/css/caliBlur.min.css b/cps/static/css/caliBlur.css
similarity index 99%
rename from cps/static/css/caliBlur.min.css
rename to cps/static/css/caliBlur.css
index 9447cd18..92cf466e 100644
--- a/cps/static/css/caliBlur.min.css
+++ b/cps/static/css/caliBlur.css
@@ -831,7 +831,10 @@ body:not(.read-frame) {
     font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
     font-weight: 400;
     overflow: hidden;
-    margin: 0
+    margin: 0;
+    /* scroll bar fix for firefox  */
+    scrollbar-color: hsla(0, 0%, 100%, .2) transparent; 
+    scrollbar-width: thin;
 }
 
 body > div.navbar.navbar-default.navbar-static-top > div > form > div {
@@ -2174,7 +2177,7 @@ body.langlist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e034"
 }
 
-body.advsearch > div.container-fluid > div > div.col-sm-10:before, body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
+body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.catlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before, body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before, body.serieslist > div.container-fluid > div > div.col-sm-10 > div.container:before {
     top: 60px;
     font-size: 24px;
     color: #eee;
@@ -2244,10 +2247,14 @@ body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before
     content: "Languages"
 }
 
-body.advsearch > div.container-fluid > div > div.col-sm-10:before {
-    content: "Advanced Search";
-    margin-left: 20%;
-    left: 0
+body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
+    padding: 15px 10px 15px 40px;
+} 
+
+@media screen and (max-width: 992px) {
+    body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
+        padding-left: 20px;
+    }
 }
 
 body.me > div.container-fluid > div > div.col-sm-10 > div.discover:before {
@@ -3502,6 +3509,20 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > h2 {
     padding-right: 25px !important
 }
 
+body.shelf-down > .discover > h2 {
+    color: inherit;
+    margin-bottom: 20px;
+}
+
+body.shelf-down > .discover > .row > .book.col-sm-3.col-lg-2.col-xs-6 {
+    max-width: 225px !important;
+    width: 225px !important;
+}
+
+body.shelf-down .btn-group button#btnGroupDrop1 {
+    height: 50px;
+}
+
 .author > .container-fluid > .row-fluid > .col-sm-10 > h2:before, .plexBack > a {
     -moz-text-size-adjust: 100%;
     -ms-text-size-adjust: 100%;
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index e2cd4ec7..2294d326 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -143,6 +143,12 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
   color: #444;
 }
 
+.container-fluid .book .meta .series {
+  font-weight: 400;
+  font-size: 12px;
+  color: #444;
+}
+
 .container-fluid .book .meta .author {
   font-size: 12px;
   color: #999;
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.el.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.el.min.js
new file mode 100644
index 00000000..046e9eb5
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.el.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.el={days:["Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο"],daysShort:["Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ"],daysMin:["Κυ","Δε","Τρ","Τε","Πε","Πα","Σα"],months:["Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος","Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος"],monthsShort:["Ιαν","Φεβ","Μαρ","Απρ","Μάι","Ιουν","Ιουλ","Αυγ","Σεπ","Οκτ","Νοε","Δεκ"],today:"Σήμερα",clear:"Καθαρισμός",weekStart:1,format:"d/m/yyyy"}}(jQuery);
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.tr.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.tr.min.js
new file mode 100644
index 00000000..7889b113
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.tr.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.tr={days:["Pazar","Pazartesi","Salı","Çarşamba","Perşembe","Cuma","Cumartesi"],daysShort:["Pz","Pzt","Sal","Çrş","Prş","Cu","Cts"],daysMin:["Pz","Pzt","Sa","Çr","Pr","Cu","Ct"],months:["Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık"],monthsShort:["Oca","Şub","Mar","Nis","May","Haz","Tem","Ağu","Eyl","Eki","Kas","Ara"],today:"Bugün",clear:"Temizle",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh_Hans_CN.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js
rename to cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.zh_Hans_CN.min.js
diff --git a/cps/static/js/libs/tinymce/langs/el.js b/cps/static/js/libs/tinymce/langs/el.js
new file mode 100644
index 00000000..b5f840da
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/el.js
@@ -0,0 +1,261 @@
+tinymce.addI18n('el',{
+"Redo": "\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7",
+"Undo": "\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7",
+"Cut": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae",
+"Copy": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Paste": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7",
+"Select all": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03cc\u03bb\u03c9\u03bd",
+"New document": "\u039d\u03ad\u03bf \u03ad\u03b3\u03b3\u03c1\u03b1\u03c6\u03bf",
+"Ok": "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9",
+"Cancel": "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
+"Visual aids": "O\u03c0\u03c4\u03b9\u03ba\u03ac \u03b2\u03bf\u03b7\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 ",
+"Bold": "\u0388\u03bd\u03c4\u03bf\u03bd\u03b7",
+"Italic": "\u03a0\u03bb\u03ac\u03b3\u03b9\u03b1",
+"Underline": "\u03a5\u03c0\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b9\u03c3\u03b7",
+"Strikethrough": "\u0394\u03b9\u03b1\u03ba\u03c1\u03b9\u03c4\u03ae \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Superscript": "\u0395\u03ba\u03b8\u03ad\u03c4\u03b7\u03c2",
+"Subscript": "\u0394\u03b5\u03af\u03ba\u03c4\u03b7\u03c2",
+"Clear formatting": "\u0391\u03c0\u03b1\u03bb\u03bf\u03b9\u03c6\u03ae \u03bc\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
+"Align left": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Align center": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03c3\u03c4\u03bf \u03ba\u03ad\u03bd\u03c4\u03c1\u03bf",
+"Align right": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Justify": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03c3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Bullet list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03bc\u03b5 \u03ba\u03bf\u03c5\u03ba\u03ba\u03af\u03b4\u03b5\u03c2",
+"Numbered list": "\u0391\u03c1\u03b9\u03b8\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1",
+"Decrease indent": "\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
+"Increase indent": "\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
+"Close": "\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf",
+"Formats": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u039f \u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03b9 \u03ac\u03bc\u03b5\u03c3\u03b7 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c7\u03b5\u03b9\u03c1\u03bf. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03af\u03bf\u03c5 Ctrl+X\/C\/V.",
+"Headers": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
+"Header 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
+"Header 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
+"Header 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
+"Header 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
+"Header 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
+"Header 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
+"Headings": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
+"Heading 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
+"Heading 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
+"Heading 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
+"Heading 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
+"Heading 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
+"Heading 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
+"Preformatted": "\u03a0\u03c1\u03bf\u03b4\u03b9\u03b1\u03bc\u03bf\u03c1\u03c6\u03c9\u03bc\u03ad\u03bd\u03bf",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
+"Paragraph": "\u03a0\u03b1\u03c1\u03ac\u03b3\u03c1\u03b1\u03c6\u03bf\u03c2",
+"Blockquote": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u03c0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2",
+"Inline": "\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03b7",
+"Blocks": "\u03a4\u03bc\u03ae\u03bc\u03b1\u03c4\u03b1",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0397 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c4\u03ce\u03c1\u03b1 \u03c3\u03b5 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c0\u03bb\u03bf\u03cd \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a4\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03b1 \u03bc\u03b9\u03b1\u03c2 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7\u03c2 \u03b8\u03b1 \u03b5\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03bf\u03cd\u03bd\u03c4\u03b1\u03b9 \u03c9\u03c2 \u03b1\u03c0\u03bb\u03cc \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03cc\u03c3\u03bf \u03b7 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c5\u03c4\u03ae \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03bd\u03b5\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03ae.",
+"Font Family": "\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac",
+"Font Sizes": "\u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2",
+"Class": "\u039a\u03bb\u03ac\u03c3\u03b7",
+"Browse for an image": "\u0391\u03bd\u03b1\u03b6\u03b7\u03c4\u03ae\u03c3\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1",
+"OR": "\u0389",
+"Drop an image here": "\u03a1\u03af\u03be\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1 \u03b5\u03b4\u03ce",
+"Upload": "\u039c\u03b5\u03c4\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7",
+"Block": "\u03a4\u03bc\u03ae\u03bc\u03b1",
+"Align": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Default": "\u03a0\u03c1\u03bf\u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf",
+"Circle": "\u039a\u03cd\u03ba\u03bb\u03bf\u03c2",
+"Disc": "\u0394\u03af\u03c3\u03ba\u03bf\u03c2",
+"Square": "\u03a4\u03b5\u03c4\u03c1\u03ac\u03b3\u03c9\u03bd\u03bf",
+"Lower Alpha": "\u03a0\u03b5\u03b6\u03ac \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
+"Lower Greek": "\u03a0\u03b5\u03b6\u03ac \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac",
+"Lower Roman": "\u03a0\u03b5\u03b6\u03ac \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
+"Upper Alpha": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
+"Upper Roman": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
+"Anchor": "\u0391\u03b3\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
+"Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
+"Id": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u039f \u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b1\u03c1\u03c7\u03af\u03b6\u03b5\u03b9 \u03bc\u03b5 \u03ad\u03bd\u03b1 \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1, \u03b1\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03bc\u03cc\u03bd\u03bf \u03b1\u03c0\u03cc \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1\u03c4\u03b1, \u03b1\u03c1\u03b9\u03b8\u03bc\u03bf\u03cd\u03c2, \u03c0\u03b1\u03cd\u03bb\u03b5\u03c2, \u03c4\u03b5\u03bb\u03b5\u03af\u03b5\u03c2, \u03ac\u03bd\u03c9 \u03c4\u03b5\u03bb\u03b5\u03af\u03b1 \u03ae \u03c5\u03c0\u03bf\u03b3\u03c1\u03b1\u03bc\u03bc\u03af\u03c3\u03b5\u03b9\u03c2.",
+"You have unsaved changes are you sure you want to navigate away?": "\u0388\u03c7\u03b5\u03c4\u03b5 \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2. \u0395\u03af\u03c3\u03c4\u03b5 \u03b2\u03ad\u03b2\u03b1\u03b9\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c6\u03cd\u03b3\u03b5\u03c4\u03b5 \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03c3\u03b5\u03bb\u03af\u03b4\u03b1;",
+"Restore last draft": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf\u03c5 \u03c3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5",
+"Special character": "\u0395\u03b9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03b1\u03c2",
+"Source code": "\u03a0\u03b7\u03b3\u03b1\u03af\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
+"Insert\/Edit code sample": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1",
+"Language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
+"Code sample": "\u0394\u03b5\u03af\u03b3\u03bc\u03b1 \u039a\u03ce\u03b4\u03b9\u03ba\u03b1",
+"Color": "\u03a7\u03c1\u03ce\u03bc\u03b1",
+"R": "\u03ba",
+"G": "\u03a0",
+"B": "\u039c",
+"Left to right": "\u0391\u03c0\u03cc \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Right to left": "\u0391\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Emoticons": "\u03a6\u03b1\u03c4\u03c3\u03bf\u03cd\u03bb\u03b5\u03c2",
+"Document properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b5\u03b3\u03b3\u03c1\u03ac\u03c6\u03bf\u03c5",
+"Title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
+"Keywords": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03ac",
+"Description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Robots": "\u03a1\u03bf\u03bc\u03c0\u03cc\u03c4",
+"Author": "\u03a3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7\u03c2",
+"Encoding": "\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Fullscreen": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7",
+"Action": "\u0395\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b1",
+"Shortcut": "\u03a3\u03c5\u03bd\u03c4\u03cc\u03bc\u03b5\u03c5\u03c3\u03b7",
+"Help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
+"Address": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7",
+"Focus to menubar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd",
+"Focus to toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
+"Focus to element path": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf\u03c5",
+"Focus to contextual toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
+"Insert link (if link plugin activated)": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03bf\u03c5 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5)",
+"Save (if save plugin activated)": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2)",
+"Find (if searchreplace plugin activated)": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7\u03c2)",
+"Plugins installed ({0}):": "\u0395\u03b3\u03ba\u03b1\u03c4\u03b5\u03c3\u03c4\u03b7\u03bc\u03ad\u03bd\u03b1 \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 ({0}):",
+"Premium plugins:": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 \u03c5\u03c8\u03b7\u03bb\u03ae\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2:",
+"Learn more...": "\u039c\u03ac\u03b8\u03b5\u03c4\u03b5 \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b1...",
+"You are using {0}": "\u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b5 {0}",
+"Plugins": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1",
+"Handy Shortcuts": "\u03a7\u03c1\u03ae\u03c3\u03b9\u03bc\u03b5\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2",
+"Horizontal line": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae",
+"Insert\/edit image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Image description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Source": "\u03a0\u03b7\u03b3\u03ae",
+"Dimensions": "\u0394\u03b9\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2",
+"Constrain proportions": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b1\u03bd\u03b1\u03bb\u03bf\u03b3\u03b9\u03ce\u03bd",
+"General": "\u0393\u03b5\u03bd\u03b9\u03ba\u03ac",
+"Advanced": "\u0393\u03b9\u03b1 \u03a0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2",
+"Style": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
+"Vertical space": "\u039a\u03ac\u03b8\u03b5\u03c4\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
+"Horizontal space": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
+"Border": "\u03a0\u03bb\u03b1\u03af\u03c3\u03b9\u03bf",
+"Insert image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Image": "\u0395\u03b9\u03ba\u03cc\u03bd\u03b1",
+"Image list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd",
+"Rotate counterclockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
+"Rotate clockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b4\u03b5\u03be\u03b9\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
+"Flip vertically": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03ba\u03b1\u03b8\u03ad\u03c4\u03c9\u03c2",
+"Flip horizontally": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03bf\u03c1\u03b9\u03b6\u03bf\u03bd\u03c4\u03af\u03c9\u03c2",
+"Edit image": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Image options": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Zoom in": "\u039c\u03b5\u03b3\u03ad\u03b8\u03c5\u03bd\u03c3\u03b7",
+"Zoom out": "\u03a3\u03bc\u03af\u03ba\u03c1\u03c5\u03bd\u03c3\u03b7",
+"Crop": "\u03a0\u03b5\u03c1\u03b9\u03ba\u03bf\u03c0\u03ae",
+"Resize": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03bc\u03b5\u03b3\u03ad\u03b8\u03bf\u03c5\u03c2",
+"Orientation": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03bd\u03b1\u03c4\u03bf\u03bb\u03b9\u03c3\u03bc\u03cc\u03c2",
+"Brightness": "\u03a6\u03c9\u03c4\u03b5\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
+"Sharpen": "\u038c\u03be\u03c5\u03bd\u03c3\u03b7",
+"Contrast": "\u0391\u03bd\u03c4\u03af\u03b8\u03b5\u03c3\u03b7",
+"Color levels": "\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03b1 \u03c7\u03c1\u03ce\u03bc\u03b1\u03c4\u03bf\u03c2",
+"Gamma": "\u0393\u03ac\u03bc\u03bc\u03b1",
+"Invert": "\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae",
+"Apply": "\u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae",
+"Back": "\u03a0\u03af\u03c3\u03c9",
+"Insert date\/time": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\u03c2\/\u03ce\u03c1\u03b1\u03c2",
+"Date\/time": "\u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\/\u03ce\u03c1\u03b1",
+"Insert link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Insert\/edit link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Text to display": "\u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03b3\u03b9\u03b1 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
+"Url": "URL",
+"Target": "\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
+"None": "\u039a\u03b1\u03bc\u03af\u03b1",
+"New window": "\u039d\u03ad\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf",
+"Remove link": "\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Anchors": "\u0386\u03b3\u03ba\u03c5\u03c1\u03b5\u03c2",
+"Link": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2",
+"Paste or type a link": "\u0395\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03ae\u03c3\u03c4\u03b5 \u03ae \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03ae\u03c3\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 email. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 mailto:;",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 http:\/\/;",
+"Link list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03c9\u03bd",
+"Insert video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
+"Insert\/edit video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
+"Insert\/edit media": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 media",
+"Alternative source": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7",
+"Poster": "\u0391\u03c6\u03af\u03c3\u03b1",
+"Paste your embed code below:": "\u0395\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9:",
+"Embed": "\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7",
+"Media": "\u039c\u03ad\u03c3\u03b1 (\u03bc\u03af\u03bd\u03c4\u03b9\u03b1)",
+"Nonbreaking space": "\u039a\u03b5\u03bd\u03cc \u03c7\u03c9\u03c1\u03af\u03c2 \u03b4\u03b9\u03b1\u03ba\u03bf\u03c0\u03ae",
+"Page break": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2",
+"Paste as text": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03c9\u03c2 \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf",
+"Preview": "\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7",
+"Print": "\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7",
+"Save": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7",
+"Find": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7",
+"Replace with": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03bc\u03b5",
+"Replace": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
+"Replace all": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03cc\u03bb\u03c9\u03bd",
+"Prev": "\u03a0\u03c1\u03bf\u03b7\u03b3.",
+"Next": "\u0395\u03c0\u03cc\u03bc.",
+"Find and replace": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
+"Could not find the specified string.": "\u0394\u03b5\u03bd \u03ae\u03c4\u03b1\u03bd \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03bb\u03c6\u03b1\u03c1\u03b9\u03b8\u03bc\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd.",
+"Match case": "\u03a4\u03b1\u03af\u03c1\u03b9\u03b1\u03c3\u03bc\u03b1 \u03c0\u03b5\u03b6\u03ce\u03bd\/\u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03c9\u03bd",
+"Whole words": "\u039f\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03b5\u03c2 \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
+"Spellcheck": "\u039f\u03c1\u03b8\u03bf\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 ",
+"Ignore": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7",
+"Ignore all": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7 \u03cc\u03bb\u03c9\u03bd",
+"Finish": "\u03a4\u03ad\u03bb\u03bf\u03c2",
+"Add to Dictionary": "\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c3\u03c4\u03bf \u039b\u03b5\u03be\u03b9\u03ba\u03cc",
+"Insert table": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Table properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Delete table": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Cell": "\u039a\u03b5\u03bb\u03af",
+"Row": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ae",
+"Column": "\u03a3\u03c4\u03ae\u03bb\u03b7",
+"Cell properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Merge cells": "\u03a3\u03c5\u03b3\u03c7\u03ce\u03bd\u03b5\u03c5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Split cell": "\u0394\u03b9\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Insert row before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
+"Insert row after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
+"Delete row": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Row properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Cut row": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Copy row": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Paste row before": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
+"Paste row after": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
+"Insert column before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Insert column after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Delete column": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2",
+"Cols": "\u03a3\u03c4\u03ae\u03bb\u03b5\u03c2",
+"Rows": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2",
+"Width": "\u03a0\u03bb\u03ac\u03c4\u03bf\u03c2",
+"Height": "\u038e\u03c8\u03bf\u03c2",
+"Cell spacing": "\u0391\u03c0\u03cc\u03c3\u03c4\u03b1\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Cell padding": "\u0391\u03bd\u03b1\u03c0\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Caption": "\u039b\u03b5\u03b6\u03ac\u03bd\u03c4\u03b1",
+"Left": "\u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Center": "\u039a\u03b5\u03bd\u03c4\u03c1\u03b1\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7",
+"Right": "\u0394\u03b5\u03be\u03b9\u03ac",
+"Cell type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Scope": "\u0388\u03ba\u03c4\u03b1\u03c3\u03b7",
+"Alignment": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"H Align": "\u039f\u03c1. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"V Align": "\u039a. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Top": "\u039a\u03bf\u03c1\u03c5\u03c6\u03ae",
+"Middle": "\u039c\u03ad\u03c3\u03b7",
+"Bottom": "\u039a\u03ac\u03c4\u03c9",
+"Header cell": "\u039a\u03b5\u03bb\u03af-\u03ba\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
+"Row group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ce\u03bd",
+"Column group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03c3\u03c4\u03b7\u03bb\u03ce\u03bd",
+"Row type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Header": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
+"Body": "\u03a3\u03ce\u03bc\u03b1",
+"Footer": "\u03a5\u03c0\u03bf\u03c3\u03ad\u03bb\u03b9\u03b4\u03bf",
+"Border color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c0\u03bb\u03b1\u03b9\u03c3\u03af\u03bf\u03c5",
+"Insert template": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03c1\u03bf\u03c4\u03cd\u03c0\u03bf\u03c5 ",
+"Templates": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03b1",
+"Template": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf",
+"Text color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 ",
+"Background color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c6\u03cc\u03bd\u03c4\u03bf\u03c5",
+"Custom...": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae...",
+"Custom color": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03c3\u03bc\u03ad\u03bd\u03bf \u03c7\u03c1\u03ce\u03bc\u03b1",
+"No color": "\u03a7\u03c9\u03c1\u03af\u03c2 \u03c7\u03c1\u03ce\u03bc\u03b1",
+"Table of Contents": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 \u03a0\u03b5\u03c1\u03b9\u03b5\u03c7\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd",
+"Show blocks": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03bc\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd",
+"Show invisible characters": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03ba\u03c1\u03c5\u03c6\u03ce\u03bd \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd",
+"Words: {0}": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2: {0}",
+"{0} words": "{0} \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
+"File": "\u0391\u03c1\u03c7\u03b5\u03af\u03bf",
+"Edit": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1",
+"Insert": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae",
+"View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
+"Format": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Table": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2",
+"Tools": "\u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03b1",
+"Powered by {0}": "\u03a4\u03c1\u03bf\u03c6\u03bf\u03b4\u03bf\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b1\u03c0\u03cc {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u0395\u03bc\u03c0\u03bb\u03bf\u03c5\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F9 \u03b3\u03b9\u03b1 \u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F10 \u03b3\u03b9\u03b1  \u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-0 \u03b3\u03b9\u03b1 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1"
+});
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/tr.js b/cps/static/js/libs/tinymce/langs/tr.js
new file mode 100644
index 00000000..200a15f1
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/tr.js
@@ -0,0 +1,419 @@
+tinymce.addI18n('tr',{
+"Redo": "Yinele",
+"Undo": "Geri al",
+"Cut": "Kes",
+"Copy": "Kopyala",
+"Paste": "Yap\u0131\u015ft\u0131r",
+"Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
+"New document": "Yeni dok\u00fcman",
+"Ok": "Tamam",
+"Cancel": "\u0130ptal",
+"Visual aids": "G\u00f6rsel ara\u00e7lar",
+"Bold": "Kal\u0131n",
+"Italic": "\u0130talik",
+"Underline": "Alt\u0131 \u00e7izili",
+"Strikethrough": "\u00dcst\u00fc \u00e7izgili",
+"Superscript": "\u00dcst simge",
+"Subscript": "Alt simge",
+"Clear formatting": "Bi\u00e7imi temizle",
+"Align left": "Sola hizala",
+"Align center": "Ortala",
+"Align right": "Sa\u011fa hizala",
+"Justify": "\u0130ki yana yasla",
+"Bullet list": "S\u0131ras\u0131z liste",
+"Numbered list": "S\u0131ral\u0131 liste",
+"Decrease indent": "Girintiyi azalt",
+"Increase indent": "Girintiyi art\u0131r",
+"Close": "Kapat",
+"Formats": "Bi\u00e7imler",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Taray\u0131c\u0131n\u0131z panoya direk eri\u015fimi desteklemiyor. L\u00fctfen Ctrl+X\/C\/V klavye k\u0131sayollar\u0131n\u0131 kullan\u0131n.",
+"Headers": "Ba\u015fl\u0131klar",
+"Header 1": "Ba\u015fl\u0131k 1",
+"Header 2": "Ba\u015fl\u0131k 2",
+"Header 3": "Ba\u015fl\u0131k 3",
+"Header 4": "Ba\u015fl\u0131k 4",
+"Header 5": "Ba\u015fl\u0131k 5",
+"Header 6": "Ba\u015fl\u0131k 6",
+"Headings": "Ba\u015fl\u0131klar",
+"Heading 1": "Ba\u015fl\u0131k 1",
+"Heading 2": "Ba\u015fl\u0131k 2",
+"Heading 3": "Ba\u015fl\u0131k 3",
+"Heading 4": "Ba\u015fl\u0131k 4",
+"Heading 5": "Ba\u015fl\u0131k 5",
+"Heading 6": "Ba\u015fl\u0131k 6",
+"Preformatted": "\u00d6nceden bi\u00e7imlendirilmi\u015f",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "Kod",
+"Paragraph": "Paragraf",
+"Blockquote": "Blockquote",
+"Inline": "Sat\u0131r i\u00e7i",
+"Blocks": "Bloklar",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00fcz metin modunda yap\u0131\u015ft\u0131r. Bu se\u00e7ene\u011fi kapatana kadar i\u00e7erikler d\u00fcz metin olarak yap\u0131\u015ft\u0131r\u0131l\u0131r.",
+"Fonts": "Yaz\u0131 Tipleri",
+"Font Sizes": "Yaz\u0131tipi B\u00fcy\u00fckl\u00fc\u011f\u00fc",
+"Class": "S\u0131n\u0131f",
+"Browse for an image": "Bir resim aray\u0131n",
+"OR": "VEYA",
+"Drop an image here": "Buraya bir resim koyun",
+"Upload": "Y\u00fckle",
+"Block": "Blok",
+"Align": "Hizala",
+"Default": "Varsay\u0131lan",
+"Circle": "Daire",
+"Disc": "Disk",
+"Square": "Kare",
+"Lower Alpha": "K\u00fc\u00e7\u00fck Harf",
+"Lower Greek": "K\u00fc\u00e7\u00fck Yunan Harfleri",
+"Lower Roman": "K\u00fc\u00e7\u00fck Roman Harfleri ",
+"Upper Alpha": "B\u00fcy\u00fck Harf",
+"Upper Roman": "B\u00fcy\u00fck Roman Harfleri ",
+"Anchor...": "\u00c7apa...",
+"Name": "\u0130sim",
+"Id": "Kimlik",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id bir harf ile ba\u015flamal\u0131d\u0131r ve harf, rakam, \u00e7izgi, nokta, iki nokta \u00fcst\u00fcste veya alt \u00e7izgi kullan\u0131labilir.",
+"You have unsaved changes are you sure you want to navigate away?": "Kaydedilmemi\u015f de\u011fi\u015fiklikler var, sayfadan ayr\u0131lmak istedi\u011finize emin misiniz?",
+"Restore last draft": "Son tasla\u011f\u0131 geri y\u00fckle",
+"Special character...": "\u00d6zel karakter...",
+"Source code": "Kaynak kodu",
+"Insert\/Edit code sample": "\u00d6rnek kod ekle\/d\u00fczenle",
+"Language": "Dil",
+"Code sample...": "Kod \u00f6rne\u011fi...",
+"Color Picker": "Renk Se\u00e7ici",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "Soldan sa\u011fa",
+"Right to left": "Sa\u011fdan sola",
+"Emoticons...": "\u0130fadeler...",
+"Metadata and Document Properties": "\u00d6nbilgi ve Belge \u00d6zellikleri",
+"Title": "Ba\u015fl\u0131k",
+"Keywords": "Anahtar kelimeler",
+"Description": "A\u00e7\u0131klama",
+"Robots": "Robotlar",
+"Author": "Yazar",
+"Encoding": "Kodlama",
+"Fullscreen": "Tam ekran",
+"Action": "Eylem",
+"Shortcut": "K\u0131sayol",
+"Help": "Yard\u0131m",
+"Address": "Adres",
+"Focus to menubar": "Men\u00fcye odaklan",
+"Focus to toolbar": "Ara\u00e7 tak\u0131m\u0131na odaklan",
+"Focus to element path": "\u00d6\u011fe yoluna odaklan",
+"Focus to contextual toolbar": "Ba\u011flamsal ara\u00e7 tak\u0131m\u0131na odaklan",
+"Insert link (if link plugin activated)": "Ba\u011flant\u0131 ekle (Ba\u011flant\u0131 eklentisi aktif ise)",
+"Save (if save plugin activated)": "Kaydet (Kay\u0131t eklentisi aktif ise)",
+"Find (if searchreplace plugin activated)": "Bul (Bul\/De\u011fi\u015ftir eklentisi aktif ise)",
+"Plugins installed ({0}):": "Eklentiler y\u00fcklendi ({0}):",
+"Premium plugins:": "Premium eklentiler:",
+"Learn more...": "Detayl\u0131 bilgi...",
+"You are using {0}": "\u015eu an {0} kullan\u0131yorsunuz",
+"Plugins": "Plugins",
+"Handy Shortcuts": "Handy Shortcuts",
+"Horizontal line": "Yatay \u00e7izgi",
+"Insert\/edit image": "Resim ekle\/d\u00fczenle",
+"Image description": "Resim a\u00e7\u0131klamas\u0131",
+"Source": "Kaynak",
+"Dimensions": "Boyutlar",
+"Constrain proportions": "Oranlar\u0131 koru",
+"General": "Genel",
+"Advanced": "Geli\u015fmi\u015f",
+"Style": "Stil",
+"Vertical space": "Dikey bo\u015fluk",
+"Horizontal space": "Yatay bo\u015fluk",
+"Border": "Kenarl\u0131k",
+"Insert image": "Resim ekle",
+"Image...": "Resim...",
+"Image list": "G\u00f6rsel listesi",
+"Rotate counterclockwise": "Saatin tersi y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
+"Rotate clockwise": "Saat y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
+"Flip vertically": "Dikine \u00e7evir",
+"Flip horizontally": "Enine \u00e7evir",
+"Edit image": "Resmi d\u00fczenle",
+"Image options": "Resim ayarlar\u0131",
+"Zoom in": "Yak\u0131nla\u015ft\u0131r",
+"Zoom out": "Uzakla\u015ft\u0131r",
+"Crop": "K\u0131rp",
+"Resize": "Yeniden Boyutland\u0131r",
+"Orientation": "Oryantasyon",
+"Brightness": "Parlakl\u0131k",
+"Sharpen": "Keskinle\u015ftir",
+"Contrast": "Kontrast",
+"Color levels": "Renk d\u00fczeyleri",
+"Gamma": "Gama",
+"Invert": "Ters \u00c7evir",
+"Apply": "Uygula",
+"Back": "Geri",
+"Insert date\/time": "Tarih\/saat ekle",
+"Date\/time": "Tarih\/saat",
+"Insert\/Edit Link": "Ba\u011flant\u0131 Ekle\/D\u00fczenle",
+"Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
+"Text to display": "Yaz\u0131y\u0131 g\u00f6r\u00fcnt\u00fcle",
+"Url": "Url",
+"Open link in...": "Ba\u011flant\u0131y\u0131 a\u00e7...",
+"Current window": "Mevcut pencere",
+"None": "Hi\u00e7biri",
+"New window": "Yeni pencere",
+"Remove link": "Ba\u011flant\u0131y\u0131 kald\u0131r",
+"Anchors": "\u00c7apalar",
+"Link...": "Ba\u011flant\u0131...",
+"Paste or type a link": "Bir ba\u011flant\u0131 yaz\u0131n yada yap\u0131\u015ft\u0131r\u0131n",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Girdi\u011finiz URL bir e-posta adresi gibi g\u00f6r\u00fcn\u00fcyor. Gerekli olan mailto: \u00f6nekini eklemek ister misiniz?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Girdi\u011finiz URL bir d\u0131\u015f ba\u011flant\u0131 gibi g\u00f6r\u00fcn\u00fcyor. Gerekli olan http:\/\/ \u00f6nekini eklemek ister misiniz?",
+"Link list": "Ba\u011flant\u0131 listesi",
+"Insert video": "Video ekle",
+"Insert\/edit video": "Video ekle\/d\u00fczenle",
+"Insert\/edit media": "Medya ekle\/d\u00fczenle",
+"Alternative source": "Alternatif kaynak",
+"Alternative source URL": "Alternatif kaynak URL",
+"Media poster (Image URL)": "Medya posteri (Resim URL)",
+"Paste your embed code below:": "Video g\u00f6mme kodunu a\u015fa\u011f\u0131ya yap\u0131\u015ft\u0131r\u0131n\u0131z:",
+"Embed": "G\u00f6mme",
+"Media...": "Medya...",
+"Nonbreaking space": "B\u00f6l\u00fcnemez bo\u015fluk",
+"Page break": "Sayfa sonu",
+"Paste as text": "Metin olarak yap\u0131\u015ft\u0131r",
+"Preview": "\u00d6nizleme",
+"Print...": "Yazd\u0131r...",
+"Save": "Kaydet",
+"Find": "Bul",
+"Replace with": "Bununla de\u011fi\u015ftir",
+"Replace": "De\u011fi\u015ftir",
+"Replace all": "T\u00fcm\u00fcn\u00fc de\u011fi\u015ftir",
+"Previous": "Geri",
+"Next": "Sonraki",
+"Find and replace...": "Bul ve de\u011fi\u015ftir...",
+"Could not find the specified string.": "Herhangi bir sonu\u00e7 bulunamad\u0131.",
+"Match case": "B\u00fcy\u00fck\/k\u00fc\u00e7\u00fck harf duyarl\u0131",
+"Find whole words only": "Sadece t\u00fcm kelimeyi ara",
+"Spell check": "Yaz\u0131m denetimi",
+"Ignore": "Yoksay",
+"Ignore all": "T\u00fcm\u00fcn\u00fc yoksay",
+"Finish": "Bitir",
+"Add to Dictionary": "S\u00f6zl\u00fc\u011fe Ekle",
+"Insert table": "Tablo ekle",
+"Table properties": "Tablo \u00f6zellikleri",
+"Delete table": "Tablo sil",
+"Cell": "H\u00fccre",
+"Row": "Sat\u0131r",
+"Column": "S\u00fctun",
+"Cell properties": "H\u00fccre \u00f6zellikleri",
+"Merge cells": "H\u00fccreleri birle\u015ftir",
+"Split cell": "H\u00fccre b\u00f6l",
+"Insert row before": "\u00dcste sat\u0131r ekle",
+"Insert row after": "Alta sat\u0131r ekle ",
+"Delete row": "Sat\u0131r sil",
+"Row properties": "Sat\u0131r \u00f6zellikleri",
+"Cut row": "Sat\u0131r\u0131 kes",
+"Copy row": "Sat\u0131r\u0131 kopyala",
+"Paste row before": "\u00dcste sat\u0131r yap\u0131\u015ft\u0131r",
+"Paste row after": "Alta sat\u0131r yap\u0131\u015ft\u0131r",
+"Insert column before": "Sola s\u00fctun ekle",
+"Insert column after": "Sa\u011fa s\u00fctun ekle",
+"Delete column": "S\u00fctun sil",
+"Cols": "S\u00fctunlar",
+"Rows": "Sat\u0131rlar",
+"Width": "Geni\u015flik",
+"Height": "Y\u00fckseklik",
+"Cell spacing": "H\u00fccre aral\u0131\u011f\u0131",
+"Cell padding": "H\u00fccre dolgusu",
+"Show caption": "Ba\u015fl\u0131\u011f\u0131 g\u00f6ster",
+"Left": "Sol",
+"Center": "Orta",
+"Right": "Sa\u011f",
+"Cell type": "H\u00fccre tipi",
+"Scope": "Kapsam",
+"Alignment": "Hizalama",
+"H Align": "Yatay Hizalama",
+"V Align": "Dikey Hizalama",
+"Top": "\u00dcst",
+"Middle": "Orta",
+"Bottom": "Alt",
+"Header cell": "Ba\u015fl\u0131k h\u00fccresi",
+"Row group": "Sat\u0131r grubu",
+"Column group": "S\u00fctun grubu",
+"Row type": "Sat\u0131r tipi",
+"Header": "Ba\u015fl\u0131k",
+"Body": "G\u00f6vde",
+"Footer": "Alt",
+"Border color": "Kenarl\u0131k rengi",
+"Insert template...": "\u015eablon ekle...",
+"Templates": "\u015eablonlar",
+"Template": "Taslak",
+"Text color": "Yaz\u0131 rengi",
+"Background color": "Arka plan rengi",
+"Custom...": "\u00d6zel...",
+"Custom color": "\u00d6zel renk",
+"No color": "Renk yok",
+"Remove color": "Rengi kald\u0131r",
+"Table of Contents": "\u0130\u00e7erik tablosu",
+"Show blocks": "Bloklar\u0131 g\u00f6ster",
+"Show invisible characters": "G\u00f6r\u00fcnmez karakterleri g\u00f6ster",
+"Word count": "Kelime say\u0131s\u0131",
+"Count": "Say\u0131m",
+"Document": "Belge",
+"Selection": "Se\u00e7im",
+"Words": "S\u00f6zc\u00fck",
+"Words: {0}": "Kelime: {0}",
+"{0} words": "{0} words",
+"File": "Dosya",
+"Edit": "D\u00fczenle",
+"Insert": "Ekle",
+"View": "G\u00f6r\u00fcn\u00fcm",
+"Format": "Bi\u00e7im",
+"Table": "Tablo",
+"Tools": "Ara\u00e7lar",
+"Powered by {0}": "Powered by {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 tu\u015funa bas\u0131n\u0131z. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 tu\u015funa bas\u0131n\u0131z. Yard\u0131m i\u00e7in ALT-0 tu\u015funa bas\u0131n\u0131z.",
+"Image title": "Resim ba\u015fl\u0131\u011f\u0131",
+"Border width": "Kenar geni\u015fli\u011fi",
+"Border style": "Kenar sitili",
+"Error": "Hata",
+"Warn": "Uyar\u0131",
+"Valid": "Ge\u00e7erli",
+"To open the popup, press Shift+Enter": "Popup'\u0131 a\u00e7mak i\u00e7in Shift+Enter'a bas\u0131n",
+"Rich Text Area. Press ALT-0 for help.": "Zengin Metin Alan\u0131. Yard\u0131m i\u00e7in Alt-0'a bas\u0131n.",
+"System Font": "Sistem Yaz\u0131 Tipi",
+"Failed to upload image: {0}": "Resim y\u00fcklenemedi: {0}",
+"Failed to load plugin: {0} from url {1}": "Eklenti y\u00fcklenemedi: {1} url\u2019sinden {0}",
+"Failed to load plugin url: {0}": "Url eklentisi y\u00fcklenemedi: {0}",
+"Failed to initialize plugin: {0}": "Eklenti ba\u015flat\u0131lamad\u0131: {0}",
+"example": "\u00f6rnek",
+"Search": "Ara",
+"All": "T\u00fcm\u00fc",
+"Currency": "Para birimi",
+"Text": "Metin",
+"Quotations": "Al\u0131nt\u0131",
+"Mathematical": "Matematik",
+"Extended Latin": "Uzat\u0131lm\u0131\u015f Latin",
+"Symbols": "Semboller",
+"Arrows": "Oklar",
+"User Defined": "Kullan\u0131c\u0131 Tan\u0131ml\u0131",
+"dollar sign": "dolar i\u015fareti",
+"currency sign": "para birimi i\u015fareti",
+"euro-currency sign": "euro para birimi i\u015fareti",
+"colon sign": "colon i\u015fareti",
+"cruzeiro sign": "cruzeiro i\u015fareti",
+"french franc sign": "frans\u0131z frang\u0131 i\u015fareti",
+"lira sign": "lira i\u015fareti",
+"mill sign": "mill i\u015fareti",
+"naira sign": "naira i\u015fareti",
+"peseta sign": "peseta i\u015fareti",
+"rupee sign": "rupi i\u015fareti",
+"won sign": "won i\u015fareti",
+"new sheqel sign": "yeni \u015fekel i\u015fareti",
+"dong sign": "dong i\u015fareti",
+"kip sign": "kip i\u015fareti",
+"tugrik sign": "tugrik i\u015fareti",
+"drachma sign": "drahma i\u015fareti",
+"german penny symbol": "alman kuru\u015f sembol\u00fc",
+"peso sign": "peso i\u015fareti",
+"guarani sign": "guarani i\u015fareti",
+"austral sign": "austral i\u015fareti",
+"hryvnia sign": "hrivniya i\u015fareti",
+"cedi sign": "cedi i\u015fareti",
+"livre tournois sign": "livre tournois i\u015fareti",
+"spesmilo sign": "spesmilo i\u015fareti",
+"tenge sign": "tenge i\u015fareti",
+"indian rupee sign": "hindistan rupisi i\u015fareti",
+"turkish lira sign": "t\u00fcrk liras\u0131 i\u015fareti",
+"nordic mark sign": "nordic i\u015fareti",
+"manat sign": "manat i\u015fareti",
+"ruble sign": "ruble i\u015fareti",
+"yen character": "yen karakteri",
+"yuan character": "yuan karakteri",
+"yuan character, in hong kong and taiwan": "yuan karakteri, hong kong ve tayvan'da kullan\u0131lan",
+"yen\/yuan character variant one": "yen\/yuan karakter de\u011fi\u015fkeni",
+"Loading emoticons...": "\u0130fadeler y\u00fckleniyor...",
+"Could not load emoticons": "\u0130fadeler y\u00fcklenemedi",
+"People": "\u0130nsan",
+"Animals and Nature": "Hayvanlar ve Do\u011fa",
+"Food and Drink": "Yiyecek ve \u0130\u00e7ecek",
+"Activity": "Etkinlik",
+"Travel and Places": "Gezi ve Yerler",
+"Objects": "Nesneler",
+"Flags": "Bayraklar",
+"Characters": "Karakter",
+"Characters (no spaces)": "Karakter (bo\u015fluksuz)",
+"{0} characters": "{0} karakter",
+"Error: Form submit field collision.": "Hata: Form g\u00f6nderme alan\u0131 \u00e7at\u0131\u015fmas\u0131.",
+"Error: No form element found.": "Hata: Form eleman\u0131 bulunamad\u0131.",
+"Update": "G\u00fcncelle\u015ftir",
+"Color swatch": "Renk \u00f6rne\u011fi",
+"Turquoise": "Turkuaz",
+"Green": "Ye\u015fil",
+"Blue": "Mavi",
+"Purple": "Mor",
+"Navy Blue": "Lacivert",
+"Dark Turquoise": "Koyu Turkuaz",
+"Dark Green": "Koyu Ye\u015fil",
+"Medium Blue": "Donuk Mavi",
+"Medium Purple": "Orta Mor",
+"Midnight Blue": "Gece Yar\u0131s\u0131 Mavisi",
+"Yellow": "Sar\u0131",
+"Orange": "Turuncu",
+"Red": "K\u0131rm\u0131z\u0131",
+"Light Gray": "A\u00e7\u0131k Gri",
+"Gray": "Gri",
+"Dark Yellow": "Koyu Sar\u0131",
+"Dark Orange": "Koyu Turuncu",
+"Dark Red": "Koyu K\u0131rm\u0131z\u0131",
+"Medium Gray": "Orta Gri",
+"Dark Gray": "Koyu Gri",
+"Light Green": "A\u00e7\u0131k Ye\u015fil",
+"Light Yellow": "A\u00e7\u0131k Sar\u0131",
+"Light Red": "A\u00e7\u0131k K\u0131rm\u0131z\u0131",
+"Light Purple": "A\u00e7\u0131k Mor",
+"Light Blue": "A\u00e7\u0131k Mavi",
+"Dark Purple": "Koyu Mor",
+"Dark Blue": "Lacivert",
+"Black": "Siyah",
+"White": "Beyaz",
+"Switch to or from fullscreen mode": "Tam ekran moduna ge\u00e7 veya \u00e7\u0131k",
+"Open help dialog": "Yard\u0131m penceresini a\u00e7",
+"history": "ge\u00e7mi\u015f",
+"styles": "stiller",
+"formatting": "bi\u00e7imlendirme",
+"alignment": "hizalanma",
+"indentation": "girinti",
+"permanent pen": "kal\u0131c\u0131 kalem",
+"comments": "yorumlar",
+"Format Painter": "Bi\u00e7im Boyac\u0131s\u0131",
+"Insert\/edit iframe": "\u0130frame ekle\/d\u00fczenle",
+"Capitalization": "B\u00fcy\u00fck Harfle Yaz\u0131m",
+"lowercase": "k\u00fc\u00e7\u00fck harf",
+"UPPERCASE": "B\u00dcY\u00dcK HARF",
+"Title Case": "\u0130lk Harfler B\u00fcy\u00fck",
+"Permanent Pen Properties": "Kal\u0131c\u0131 Kalem \u00d6zellikleri",
+"Permanent pen properties...": "Kal\u0131c\u0131 kalem \u00f6zellikleri...",
+"Font": "Yaz\u0131 Tipi",
+"Size": "Boyut",
+"More...": "Devam\u0131...",
+"Spellcheck Language": "Yaz\u0131m Denetimi Dili",
+"Select...": "Se\u00e7...",
+"Preferences": "Tercihler",
+"Yes": "Evet",
+"No": "Hay\u0131r",
+"Keyboard Navigation": "Klavye Tu\u015flar\u0131",
+"Version": "S\u00fcr\u00fcm",
+"Anchor": "\u00c7apa",
+"Special character": "\u00d6zel karakter",
+"Code sample": "Code sample",
+"Color": "Renk",
+"Emoticons": "\u0130fadeler",
+"Document properties": "Dok\u00fcman \u00f6zellikleri",
+"Image": "Resim",
+"Insert link": "Ba\u011flant\u0131 ekle",
+"Target": "Hedef",
+"Link": "Ba\u011flant\u0131",
+"Poster": "Poster",
+"Media": "Medya",
+"Print": "Yazd\u0131r",
+"Prev": "\u00d6nceki",
+"Find and replace": "Bul ve de\u011fi\u015ftir",
+"Whole words": "Tam kelimeler",
+"Spellcheck": "Yaz\u0131m denetimi",
+"Caption": "Ba\u015fl\u0131k",
+"Insert template": "\u015eablon ekle"
+});
\ No newline at end of file
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index b60d4976..659c6e9c 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -8,7 +8,7 @@ from shutil import copyfile
 
 from sqlalchemy.exc import SQLAlchemyError
 
-from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
+from cps.services.worker import CalibreTask
 from cps import calibre_db, db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 41a9aebb..0015d6e2 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -70,6 +70,14 @@
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
@@ -114,6 +122,14 @@
 		    {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         <div class="rating">
           {% for number in range((entry.average_rating)|float|round|int(2)) %}
           <span class="glyphicon glyphicon-star good"></span>
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 7e343d79..9abe3666 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -34,6 +34,14 @@
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 574bac72..042ed1c5 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -13,7 +13,7 @@
     <link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
     {% if g.current_theme == 1 %}
-       <link href="{{ url_for('static', filename='css/caliBlur.min.css') }}" rel="stylesheet" media="screen">
+       <link href="{{ url_for('static', filename='css/caliBlur.css') }}" rel="stylesheet" media="screen">
     {% endif %}
   </head>
   <body>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 13105008..e60f92fe 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -33,6 +33,14 @@
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
@@ -101,6 +109,14 @@
             {% endif %}
           {%endfor%}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index e43801d3..c555f556 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -16,7 +16,7 @@
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/upload.css') }}" rel="stylesheet" media="screen">
     {% if g.current_theme == 1 %}
-       <link href="{{ url_for('static', filename='css/caliBlur.min.css') }}" rel="stylesheet" media="screen">
+       <link href="{{ url_for('static', filename='css/caliBlur.css') }}" rel="stylesheet" media="screen">
        <link href="{{ url_for('static', filename='css/caliBlur_override.css') }}" rel="stylesheet" media="screen">
     {% endif %}
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 868a240e..cba430a4 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -72,6 +72,15 @@
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
+
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index f1ea250f..e713fb93 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -1,5 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
+<h1 class="{{page}}">{{title}}</h1>
 <div class="col-md-10 col-lg-6">
   <form role="form" id="search" action="{{ url_for('web.advanced_search_form') }}" method="POST">
     <div class="form-group">
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 02f536fa..a2655f96 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -43,6 +43,14 @@
             {% endif %}
           {% endfor %}
         </p>
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index|formatseriesindex}})
+        </p>
+        {% endif %}
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index a1047026..b4d1594a 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -12,8 +12,9 @@
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
     <link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
-    {% if g.user.get_theme == 1 %}
-       <link href="{{ url_for('static', filename='css/caliBlur-style.css') }}" rel="stylesheet" media="screen">
+    {% if g.current_theme == 1 %}
+       <link href="{{ url_for('static', filename='css/caliBlur.css') }}" rel="stylesheet" media="screen">
+       <link href="{{ url_for('static', filename='css/caliBlur_override.css') }}" rel="stylesheet" media="screen">
     {% endif %}
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -24,7 +25,7 @@
 
     {% block header %}{% endblock %}
   </head>
-  <body class="{{ page }}">
+  <body class="{{ page }} shelf-down">
 {% block body %}
 <div class="discover">
   <h2>{{title}}</h2>
@@ -43,7 +44,14 @@
             {% endif %}
           {% endfor %}
         </p>
-
+        {% if entry.series.__len__() > 0 %}
+        <p class="series">
+          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+            {{entry.series[0].name}}
+          </a>
+          ({{entry.series_index}})
+        </p>
+        {% endif %}
       </div>
 
 	  <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 47b7740a..d5031770 100644
Binary files a/cps/translations/cs/LC_MESSAGES/messages.mo and b/cps/translations/cs/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 30a66aca..04c6a949 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-06-09 21:11+0100\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
@@ -45,9 +45,9 @@ msgstr "Úspěšně obnovené připojení"
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Neznámý"
@@ -65,12 +65,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zakázat"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Povolit"
 
@@ -120,7 +120,7 @@ msgstr "Umístění souboru klíčů není platné, zadejte prosím správnou ce
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění certifikátu není platné, zadejte prosím správnou cestu"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -138,15 +138,15 @@ msgstr "Databáze není zapisovatelná"
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
@@ -172,121 +172,121 @@ msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Došlo k neznámé chybě."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Zkušební e-mail úspěšně odeslán na %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Při odesílání zkušebního e-mailu došlo k chybě: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizace dokončena, klepněte na tlačítko OK a znovu načtěte stránku"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
@@ -298,103 +298,98 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "Formát knihy úspěšně smazán"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Chyba otevírání eknihy. Soubor neexistuje nebo není přístupný"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "upravit metadata"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s není platným jazykem"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Soubor s příponou '%(ext)s' nelze odeslat na tento server"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Soubor, který má být odeslán musí mít příponu"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nepodařilo se vytvořit cestu %(path)s (oprávnění odepřeno)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Formát souboru %(ext)s přidán do %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Chyba při úpravách knihy, zkontrolujte prosím log pro podrobnosti"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Soubor %(filename)s nemohl být uložen do dočasného adresáře"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Nahraná kniha pravděpodobně existuje v knihovně, zvažte prosím změnu před nahráním nové: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Nepodařilo se přesunout soubor %(file)s: %(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Nepodařilo se přesunout soubor obalu %(file)s: %(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kniha byla úspěšně zařazena do fronty pro převod do %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Při převodu této knihy došlo k chybě: %(res)s"
@@ -407,175 +402,154 @@ msgstr "Google Drive nastavení nebylo dokončeno, zkuste  znovu deaktivovat a a
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Doména zpětného volání není ověřena, postupujte podle pokynů k ověření domény v konzole pro vývojáře google"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formát pro knihu: %(book)d nenalezen"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s nenalezen na Google Drive: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Poslat do Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Tento e-mail byl odeslán přes Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nenalezen: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Poslat do Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Tento e-mail byl odeslán přes Calibre-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web zkušební e-mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Zkušební e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Začínáme s Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrační e-mail pro uživatele: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Poslat %(format)s do Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Převést %(orig)s do %(format)s a poslat do Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Požadovaný soubor nelze přečíst. Možná nesprávná oprávnění?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Mazání knihy selhalo %(id)s failed: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Mazání knihy %(id)s, cesta ke knize není platná %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Přejmenování názvu z: '%(src)s' na '%(dest)s'  selhalo chybou: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Přejmenovat autora z: '%(src)s' na '%(dest)s' selhalo chybou: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Přejmenování souboru v cestě '%(src)s' na '%(dest)s' selhalo  chybou: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Soubor %(file)s nenalezen na Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Chyba stahování obalu"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Chyba formátu obalu"
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Vytvoření cesty obalu selhalo"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Soubor obalu není platný, nebo nelze uložit"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Pouze jpg/jpeg/png/webp jsou podporované soubory pro obal"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Pouze jpg/jpeg jsou podporované soubory pro obal"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Chyba provádění UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Čekám"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Spuštěno"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Převést:"
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Nahrát:"
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Neznámá úloha:"
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Pro získání platného api_endpoint pro zařízení Kobo, přístupte na calibre-web bez localhost"
@@ -605,7 +579,7 @@ msgstr "Přihlášení pomocí Google selhalo."
 msgid "Failed to fetch user info from Google."
 msgstr "Nepodařilo se načíst informace o uživateli z Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -710,7 +684,7 @@ msgstr "Police %(title)s vytvořena"
 msgid "There was an error"
 msgstr "Došlo k chybě"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
@@ -741,388 +715,426 @@ msgstr "Skrytá kniha"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Nedávno přidáné"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Zobrazit nedávné knihy"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Žhavé knihy"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Zobrazit žhavé knihy"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Zobrazit nepřečtené"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Objevte"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Zobrazit náhodné knihy"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Kategorie"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Zobrazit výběr kategorie"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Série"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Zobrazit výběr sérií"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Autoři"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Vydavatelé"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Zobrazit výběr vydavatele"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Jazyky"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Zobrazit výběr jazyka"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Hodnocení"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Zobrazit výběr hodnocení"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Formáty souborů"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Neočekávaná data při čtení informací o aktualizaci"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Aktualizace není k dispozici. Máte nainstalovanou nejnovější verzi"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizujte na nejnovější verzi."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Nelze získat informace o aktualizaci"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Nejsou k dispozici žádné informace o verzi"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizujte na verzi: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klepnutím na tlačítko níže aktualizujte na nejnovější stabilní verzi."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "Uživatel úspěšně importován"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Nedávno přidané knihy"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Knihy"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Jejda! Vybraná kniha není k dispozici. Soubor neexistuje nebo není přístupný"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Seznam hodnocení"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Seznam formátů"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Úlohy"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Hledat"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Vydáno po "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Vydáno před "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Hodnocení <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Hodnocení >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "hledat"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Rozšířené hledání"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Hledat"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Seznam hodnocení"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Seznam formátů"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Vydáno po "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Vydáno před "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Hodnocení <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Hodnocení >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Při odesílání této knihy došlo k chybě: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "registrovat"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Toto uživatelské jméno nebo e-mailová adresa jsou již používány."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Záložní přihlášení jako: ‘%(nickname)s’, server LDAP není dosažitelný nebo neznámý uživatel"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "přihlásit se"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Token nenalezen"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Token vypršel"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Úspěch! Vraťte se prosím do zařízení"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Číst knihu"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre převaděč %(tool)s nenalezen"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Převaděč eknih selhal: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-převaděč selhal: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Převedený soubor nebyl nalezen nebo více než jeden soubor ve složce %(folder)s"
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Převaděč eknih selhal: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Uživatelé"
@@ -1161,7 +1173,7 @@ msgstr "Nahrávat"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Stahovat"
 
@@ -1174,8 +1186,9 @@ msgid "Edit"
 msgstr "Upravovat"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1320,16 +1333,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1349,20 +1362,19 @@ msgstr "přes"
 msgid "In Library"
 msgstr "V knihovně"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Vše"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "redukovat"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Více od"
 
@@ -1394,17 +1406,17 @@ msgstr "Převést do:"
 msgid "Convert book"
 msgstr "Převést knihu"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Název knihy"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Popis"
 
@@ -1412,15 +1424,15 @@ msgstr "Popis"
 msgid "Identifiers"
 msgstr "Identifikátory"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "Typy identifikátorů"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "Hodnota identifikátorů"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -1428,7 +1440,7 @@ msgstr "Odstranit"
 msgid "Add Identifier"
 msgstr "Přidat identifikátor"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Štítky"
 
@@ -1452,9 +1464,9 @@ msgstr "Nahrát obal z místní jednotky"
 msgid "Published Date"
 msgstr "Datum vydání"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Vydavatel"
 
@@ -1463,11 +1475,11 @@ msgstr "Vydavatel"
 msgid "Language"
 msgstr "Jazyk"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ano"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ne"
 
@@ -1479,7 +1491,7 @@ msgstr "Nahrát formát"
 msgid "View Book on Save"
 msgstr "Zobrazit knihu po uložení"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
@@ -1489,60 +1501,133 @@ msgstr "Získat metadata"
 msgid "Save"
 msgstr "Uložit"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Jste si opravdu jisti?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Tato kniha bude trvale odstraněna z databáze"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "a z hard disku"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Důležitá Kobo poznámka: smazané knihy zůstanou na jakémkoli spárovaném zařízení Kobo."
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Knihy musí být nejprve archivovány a zařízení musí být synchronizováno, než bude kniha bezpečně smazána."
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Klíčové slovo"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr "Hledat klíčové slovo"
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Kliknutím na obal načtěte metadata do formuláře"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Zavřít"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Zdroj"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Chyba vyhledávání!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nebyly nalezeny žádné výsledky! Zadejte jiné klíčové slovo."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Název"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Jste si opravdu jisti?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Konfigurace knihovny"
@@ -1832,10 +1917,6 @@ msgstr "Přihlásit"
 msgid "View Configuration"
 msgstr "Prohlížet konfiguraci"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Název"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Počet náhodných knih k zobrazení"
@@ -1844,7 +1925,7 @@ msgstr "Počet náhodných knih k zobrazení"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Počet autorů k zobrazení před skrytím (0 = Zakázat skrytí)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Motiv"
 
@@ -1978,7 +2059,7 @@ msgstr "Přidat do police"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Veřejné)"
 
@@ -2030,7 +2111,7 @@ msgstr "Zakázané domény pro registraci"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Opravdu chcete odstranit toto pravidlo domény?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Další"
 
@@ -2046,7 +2127,7 @@ msgstr "Vytvořit problém"
 msgid "Return to Home"
 msgstr "Zpět domů"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Seřadit podle serií"
 
@@ -2119,7 +2200,7 @@ msgid "Home"
 msgstr "Domů"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Zpět"
 
@@ -2131,12 +2212,8 @@ msgstr "Přepnout navigaci"
 msgid "Search Library"
 msgstr "Hledat v knihovně"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Rozšířené hledání"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -2152,7 +2229,7 @@ msgstr "Odhlásit se"
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Nahrávání..."
 
@@ -2164,27 +2241,23 @@ msgstr "Prosím neobnovujte stránku"
 msgid "Browse"
 msgstr "Procházet"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Vaše police"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "O knihovně"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Předchozí"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Chyba"
 
@@ -2216,30 +2289,50 @@ msgstr "Streamový výstup, nelze zobrazit"
 msgid "Show Access Log: "
 msgstr "Zobrazit log přístupu: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Vybrat povolené/zakázané štítky"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Vybrat povolené/zakázané hodnoty vlastních sloupců"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Vybrat povolené/zakázané uživatelské štítky"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Vybrat povolené/zakázané hodnoty vlastních sloupců uživatele"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Vložte štítek"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Přidat omezení náhledu"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Tato kniha bude trvale odstraněna z databáze"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "a z hard disku"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Důležitá Kobo poznámka: smazané knihy zůstanou na jakémkoli spárovaném zařízení Kobo."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Knihy musí být nejprve archivovány a zařízení musí být synchronizováno, než bude kniha bezpečně smazána."
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web katalog eknih"
@@ -2248,99 +2341,99 @@ msgstr "Calibre-Web katalog eknih"
 msgid "Reflow text when sidebars are open."
 msgstr "Po otevření postranních panelů přeformátujte text."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Předchozí strana"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Následujicí strana"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Změnit měřítko na nejlepší"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Změnit měřítko na šířku"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Změnit měřítko na výšku"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Změnit měřítko na nativní"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Převrátit obrázek"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Světlý"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Tmavý"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Měřítko"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Nejlepší"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Šířka"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Výška"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Nativní"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Otočit"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Převrátit"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Vodorovně"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Svisle"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Směr"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Zleva doprava"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Zprava doleva"
 
@@ -2392,39 +2485,39 @@ msgstr "Termín vyhledávání:"
 msgid "Results for:"
 msgstr "Výsledky pro:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Datum vydání od"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Datum vydání do"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Vynechat štítky"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Vynechat série"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Vynechat jazyky"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Přípony"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Vynechat přípony"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Hodnoceni více než"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Hodnocení méně než"
 
@@ -2440,11 +2533,11 @@ msgstr "Upravit polici"
 msgid "Change order"
 msgstr "Změnit řazení"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Police bude smazána pro všechny uživatele"
 
@@ -2560,15 +2653,11 @@ msgstr "Přidat povolené/zakázané hodnoty vlastních sloupců"
 msgid "Delete User"
 msgstr "Odstranit tohoto uživatele"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Nedávná stahování"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Vygenerovat URL pro Kobo Auth"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Opravdu chcete odstranit Kobo token?"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 29125075..cbc89591 100644
Binary files a/cps/translations/de/LC_MESSAGES/messages.mo and b/cps/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 9a7e6c55..957d1c6b 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-09-26 16:18+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -46,9 +46,9 @@ msgstr "Erfolgreich neu verbunden"
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -66,12 +66,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Verbieten"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Erlauben"
 
@@ -121,7 +121,7 @@ msgstr "Schlüsseldatei ist ungültig, bitte einen gültigen Pfad angeben"
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -139,15 +139,15 @@ msgstr "Datenbank ist nicht schreibbar"
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
@@ -173,121 +173,121 @@ msgstr "Benutzer kann nicht gelöscht werden, es wäre kein Admin Benutzer übri
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Es trat ein Fehler beim Versenden der Test-E-Mail auf: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
@@ -299,103 +299,98 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "Buch Format erfolgreich gelöscht"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
-msgstr "Buch erfolgreich geschlöscht"
+msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ist keine gültige Sprache"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Dateiendung '%(ext)s' kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Die Datei %(filename)s konnte nicht im temporären Ordner gespeichert werden"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Das hochgeladene Buch existiert evtl. schon in der Bibliothek: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Fehler beim Verschieben der Datei %(file)s: %(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Fehler beim Verschieben der Cover Datei %(file)s: %(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Buch wurde erfolgreich für die Konvertierung nach %(book_format)s eingereiht"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
@@ -408,175 +403,154 @@ msgstr "Google Drive Setup is nicht komplett, bitte versuche Google Drive zu dea
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s Format für Buch-ID %(book)d nicht gefunden"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s von Buch %(fn)s nicht auf Google Drive gefunden"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "An Kindle senden"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nicht gefunden: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "An Kindle senden"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web Test-E-Mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Test-E-Mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrierungs-E-Mail für Benutzer %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Sende %(format)s an Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konvertiere %(orig)s nach %(format)s und sende an Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-Mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Die angeforderte Datei konnte nicht gelesen werden. Evtl. falsche Zugriffsrechte?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Löschen des Ordners für Buch %(id)s ist fehlgeschlagen, der Pfad hat Unterordner: %(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Löschen von Buch %(id)s fehlgeschlagen: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Lösche Buch %(id)s, Pfad zum Buch nicht gültig: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen des Titels '%(src)s' zu '%(dest)s' schlug fehl: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Umbenennen des Authors '%(src)s' zu '%(dest)s' schlug fehl: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen der Datei im Pfad '%(src)s' nach '%(dest)s' ist fehlgeschlagen: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Fehler beim Herunterladen des Covers"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Coverdatei fehlerhaft"
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Fehler beim Erzeugen des Ordners für die Coverdatei"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Cover Datei ist keine gültige Bilddatei, kann nicht gespeichert werden"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg/png/webp Dateien als Cover untertützt"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg Dateien als Cover untertützt"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-Mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konvertiere: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Upload: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Unbekannte Aufgabe: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Bitte nicht von \"localhost\" auf Calibre-Web zugreifen, um einen gültigen  api_endpoint für Kobo Geräte zu erhalten"
@@ -606,7 +580,7 @@ msgstr "Login mit Google fehlgeschlagen."
 msgid "Failed to fetch user info from Google."
 msgstr "Laden der Benutzerinformationen von Google fehlgeschlagen."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -711,7 +685,7 @@ msgstr "Bücherregal %(title)s erzeugt"
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
@@ -742,388 +716,426 @@ msgstr "Verstecktes Buch"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Kürzlich hinzugefügt"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Zeige kürzlich hinzugefügte Bücher"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Beliebte Bücher"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Zeige beliebte Bücher"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Zeige Ungelesene"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Entdecke"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Zeige zufällige Bücher"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Kategorien"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Zeige Kategorienauswahl"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Serien"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Zeige Serienauswahl"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Autoren"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Verleger"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Zeige Verlegerauswahl"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Sprachen"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Zeige Sprachauswahl"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Bewertungen"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Zeige Bewertungsauswahl"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Dateiformate"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Updateinformationen enthalten unbekannte Daten"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Kein Update verfügbar. Es ist bereits die aktuellste Version installiert"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Es sind Updates verfügbar. Klicke auf den Button unten, um auf die aktuellste Version zu aktualisieren."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Updateinformationen konnten nicht geladen werden"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Version: %(version)s zu aktualisieren"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicke auf den Button unten, um auf die letzte stabile Version zu aktualisieren."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "Benutzer erfolgreich hinzugefügt"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Kürzlich hinzugefügte Bücher"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Bücher"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Bewertungsliste"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Liste der Dateiformate"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Suche"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Herausgegeben nach dem "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Herausgegeben vor dem "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Bewertung <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Bewertung >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "Suche"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Erweiterte Suche"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Suche"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Bewertungsliste"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Liste der Dateiformate"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Herausgegeben nach dem "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Herausgegeben vor dem "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Bewertung <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Bewertung >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Eine Bestätigungs-E-Mail wurde an deinen E-Mail Account versendet."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Rückfall Login als: '%(nickname)s', LDAP Server ist nicht erreichbar, oder der Nutzer ist unbekannt"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Token ist abgelaufen"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre E-Book Konverter %(tool)s nicht gefunden"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Fehler des EBook-Converters: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify Konverter Aufruf fehlgeschlagen: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Konvertierte Datei nicht gefunden, oder mehr als eine Datei im Pfad %(folder)s"
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Fehler des EBook-Converters: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Benutzerliste"
@@ -1162,7 +1174,7 @@ msgstr "Upload"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Download"
 
@@ -1175,8 +1187,9 @@ msgid "Edit"
 msgstr "Editieren"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1321,16 +1334,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Abbruch"
 
@@ -1350,20 +1363,19 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Bibliothek"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Alle"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "Reduzieren"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Mehr von"
 
@@ -1395,17 +1407,17 @@ msgstr "Konvertiere nach:"
 msgid "Convert book"
 msgstr "Konvertiere Buch"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1413,15 +1425,15 @@ msgstr "Beschreibung"
 msgid "Identifiers"
 msgstr "IDs"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "ID Typ"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "ID Wert"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1429,7 +1441,7 @@ msgstr "Entfernen"
 msgid "Add Identifier"
 msgstr "ID hinzufügen"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Tags"
 
@@ -1453,9 +1465,9 @@ msgstr "Coverdatei von Lokalem Laufwerk hochladen"
 msgid "Published Date"
 msgstr "Herausgabedatum"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Herausgeber"
 
@@ -1464,11 +1476,11 @@ msgstr "Herausgeber"
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nein"
 
@@ -1480,7 +1492,7 @@ msgstr "Format hochladen"
 msgid "View Book on Save"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
@@ -1490,60 +1502,133 @@ msgstr "Metadaten laden"
 msgid "Save"
 msgstr "Speichern"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Sicher?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Das Buch wird aus der Calibre-Datenbank"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "und von der Festplatte gelöscht"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Wichtiger Kobo Hinweis: Gelöschte Bücher bleiben auf auf allen verbundenen Kobo Geräten erhalten."
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Bücher müssen zuerst archiviert werden und dann mit dem Gerät synchronisiert werden, bevor ein Buch sicher gelöscht werden kann."
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Suchbegriff "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Klicke auf das Bild, um die Metadaten zu übertragen"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Schließen"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Quelle"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Fehler bei der Suche!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Keine Ergebnisse gefunden! Bitte ein anderes Schlüsselwort benutzen."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Sicher?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Bibliothekskonfiguration"
@@ -1833,10 +1918,6 @@ msgstr "Login"
 msgid "View Configuration"
 msgstr "Ansichtskonfiguration"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Anzahl anzuzeigender zufälliger Bücher"
@@ -1845,7 +1926,7 @@ msgstr "Anzahl anzuzeigender zufälliger Bücher"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Anzahl in Übersicht anzuzeigender Autoren (0=alle werden angezeigt)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Theme"
 
@@ -1979,7 +2060,7 @@ msgstr "Zu Bücherregal hinzufügen"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Öffentlich)"
 
@@ -2031,7 +2112,7 @@ msgstr "Verbotene Domains für eine Registrierung"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Soll diese Domain-Regel wirklich gelöscht werden?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Nächste"
 
@@ -2047,7 +2128,7 @@ msgstr "Issue erzeuge"
 msgid "Return to Home"
 msgstr "Zurück zur Hauptseite"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Nach Serien gruppieren"
 
@@ -2120,7 +2201,7 @@ msgid "Home"
 msgstr "Home"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Zurück"
 
@@ -2132,12 +2213,8 @@ msgstr "Nagivation umschalten"
 msgid "Search Library"
 msgstr "Bibiliothek durchsuchen"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Erweiterte Suche"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -2153,7 +2230,7 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Lade hoch..."
 
@@ -2165,27 +2242,23 @@ msgstr "Bitte die Seite nicht neu laden"
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Deine Bücherregale"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Über"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Vorheriger Eintrag"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Buchdetails"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Fehler"
 
@@ -2217,30 +2290,50 @@ msgstr "Stream Ausgabe, kann nicht angezeigt werden"
 msgid "Show Access Log: "
 msgstr "Zugriffslogbuch anzeigen: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Erlaubte/verbotene Tags auswählen"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten auswählen"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Erlaubte/Verbotene Tags des Benutzers auswählen"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Erlaubte/Verbotene Calibre Spalten des Benutzers auswählen"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Tag eingeben"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Sichtbeschränkung hinzufügen"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Das Buch wird aus der Calibre-Datenbank"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "und von der Festplatte gelöscht"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Wichtiger Kobo Hinweis: Gelöschte Bücher bleiben auf auf allen verbundenen Kobo Geräten erhalten."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Bücher müssen zuerst archiviert werden und dann mit dem Gerät synchronisiert werden, bevor ein Buch sicher gelöscht werden kann."
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web E-Book-Katalog"
@@ -2249,99 +2342,99 @@ msgstr "Calibre-Web E-Book-Katalog"
 msgid "Reflow text when sidebars are open."
 msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Optimale Skalierung"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Skaliere auf Breite"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Skaliere auf Höhe"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Skaliere 1:1"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Rechts rotieren"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Links rotieren"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Bild umdrehen"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Hell"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Dunkel"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Skalierung"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Breite"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Höhe"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "1:1"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Rotieren"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Umdrehen"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Leserichtung"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Links nach rechts"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Rechts nach links"
 
@@ -2393,39 +2486,39 @@ msgstr "Suchbegriff:"
 msgid "Results for:"
 msgstr "Ergebnisse für:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Herausgabedatum von"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Herausgabedatum bis"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Tags ausschließen"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Serien ausschließen"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Sprachen ausschließen"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Erweiterungen ausschließen"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Bewertungen größer als"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Bewertungen kleiner als"
 
@@ -2441,11 +2534,11 @@ msgstr "Bücherregal editieren"
 msgid "Change order"
 msgstr "Reihenfolge ändern"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Wirklich das Bücherregal löschen?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Das Bücherregal wird für alle und für immer gelöscht"
 
@@ -2561,15 +2654,11 @@ msgstr "Erlaubte/Verbotene Calibre Spalten hinzufügen"
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Letzte Downloads"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Kobo Auth URL erzeugen"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Möchten Sie wirklich den Kobo Token löschen?"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..213abc39
Binary files /dev/null and b/cps/translations/el/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..344128b8
--- /dev/null
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -0,0 +1,2663 @@
+# Greek Translations for Calibre-Web.
+# Copyright (C) 2020 Ozzie Isaacs
+# This file is distributed under the same license as the Calibre-Web project.
+# Depountis Georgios 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Depountis Georgios\n"
+"Language: el\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+
+#: cps/about.py:42
+msgid "installed"
+msgstr "εγκαταστάθηκε"
+
+#: cps/about.py:44 cps/converter.py:33
+msgid "not installed"
+msgstr "δεν εγκαταστάθηκε"
+
+#: cps/about.py:96
+msgid "Statistics"
+msgstr "Στατιστικά"
+
+#: cps/admin.py:93
+msgid "Server restarted, please reload page"
+msgstr "Ο διακομιστής επανεκκίνησε, παρακαλούμε φόρτωσε ξανά τη σελίδα"
+
+#: cps/admin.py:95
+msgid "Performing shutdown of server, please close window"
+msgstr "Πραγματοποιείται κλείσιμο του διακομιστή, παρακαλούμε κλείσε το παράθυρο"
+
+#: cps/admin.py:103
+msgid "Reconnect successful"
+msgstr "Επιτυχής επανασύνδεση"
+
+#: cps/admin.py:106
+msgid "Unknown command"
+msgstr "Άγνωστη εντολή"
+
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
+#: cps/uploader.py:108
+msgid "Unknown"
+msgstr "ʼΑγνωστο"
+
+#: cps/admin.py:136
+msgid "Admin page"
+msgstr "Σελίδα διαχειριστή"
+
+#: cps/admin.py:158
+msgid "UI Configuration"
+msgstr "UI Διαμόρφωση"
+
+#: cps/admin.py:190 cps/admin.py:717
+msgid "Calibre-Web configuration updated"
+msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
+
+#: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
+#: cps/templates/modal_dialogs.html:29
+msgid "Deny"
+msgstr "Απόρριψη"
+
+#: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
+#: cps/templates/modal_dialogs.html:28
+msgid "Allow"
+msgstr "Επιτρέπεται"
+
+#: cps/admin.py:511
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
+
+#: cps/admin.py:550
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
+
+#: cps/admin.py:555
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
+
+#: cps/admin.py:581
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
+
+#: cps/admin.py:594
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
+
+#: cps/admin.py:597
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
+
+#: cps/admin.py:601
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
+
+#: cps/admin.py:604
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
+
+#: cps/admin.py:608
+msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
+msgstr "Το Πιστοποιητικό Τοποθεσίας LDAP δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:630
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:634
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
+#: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
+#: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
+msgid "Settings DB is not Writeable"
+msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
+
+#: cps/admin.py:712
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
+
+#: cps/admin.py:714
+msgid "DB is not Writeable"
+msgstr "Η DB δεν μπορεί να Γραφτεί"
+
+#: cps/admin.py:747
+msgid "Basic Configuration"
+msgstr "Βασική Διαμόρφωση"
+
+#: cps/admin.py:762 cps/web.py:1505
+msgid "Please fill out all fields!"
+msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
+
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
+msgid "Add new user"
+msgstr "Προσθήκη νέου χρήστη"
+
+#: cps/admin.py:774 cps/web.py:1751
+msgid "E-mail is not from valid domain"
+msgstr "Το E-mail δεν είναι από έγκυρο domain"
+
+#: cps/admin.py:781 cps/admin.py:796
+msgid "Found an existing account for this e-mail address or nickname."
+msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
+
+#: cps/admin.py:792
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
+
+#: cps/admin.py:808
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
+
+#: cps/admin.py:811
+msgid "No admin user remaining, can't delete user"
+msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
+
+#: cps/admin.py:817
+msgid "No admin user remaining, can't remove admin role"
+msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
+
+#: cps/admin.py:853 cps/web.py:1793
+msgid "Found an existing account for this e-mail address."
+msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
+
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "Επεξεργασία χρήστη %(nick)s"
+
+#: cps/admin.py:868 cps/web.py:1762
+msgid "This username is already taken"
+msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
+
+#: cps/admin.py:883
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
+
+#: cps/admin.py:886
+msgid "An unknown error occured."
+msgstr "Προέκυψε ένα άγνωστο σφάλμα."
+
+#: cps/admin.py:916 cps/templates/admin.html:71
+msgid "Edit E-mail Server Settings"
+msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
+
+#: cps/admin.py:945
+#, python-format
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr "Το e-mail δοκιμής στάλθηκε επιτυχώς στο %(kindlemail)s"
+
+#: cps/admin.py:948
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
+
+#: cps/admin.py:950
+msgid "Please configure your e-mail address first..."
+msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
+
+#: cps/admin.py:952
+msgid "E-mail server settings updated"
+msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
+
+#: cps/admin.py:963
+msgid "User not found"
+msgstr "Δεν βρέθηκε χρήστης"
+
+#: cps/admin.py:990
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
+
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
+msgid "An unknown error occurred. Please try again later."
+msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
+
+#: cps/admin.py:996 cps/web.py:1467
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
+
+#: cps/admin.py:1008
+msgid "Logfile viewer"
+msgstr "Προβολέας αρχείου φύλλου καταγραφής"
+
+#: cps/admin.py:1047
+msgid "Requesting update package"
+msgstr "Αίτημα πακέτου ενημέρωσης"
+
+#: cps/admin.py:1048
+msgid "Downloading update package"
+msgstr "Κατεβάζει πακέτο ενημέρωσης"
+
+#: cps/admin.py:1049
+msgid "Unzipping update package"
+msgstr "Ανοίγει πακέτο ενημέρωσης"
+
+#: cps/admin.py:1050
+msgid "Replacing files"
+msgstr "Αντικατάσταση αρχείων"
+
+#: cps/admin.py:1051
+msgid "Database connections are closed"
+msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
+
+#: cps/admin.py:1052
+msgid "Stopping server"
+msgstr "Σταματάει το διακομιστή"
+
+#: cps/admin.py:1053
+msgid "Update finished, please press okay and reload page"
+msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
+
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
+msgid "Update failed:"
+msgstr "Η ενημέρωση απέτυχε:"
+
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+msgid "HTTP Error"
+msgstr "HTTP Σφάλμα"
+
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
+msgid "Connection error"
+msgstr "Σφάλμα σύνδεσης"
+
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
+msgid "Timeout while establishing connection"
+msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
+
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
+msgid "General error"
+msgstr "Γενικό σφάλμα"
+
+#: cps/admin.py:1058
+msgid "Update File Could Not be Saved in Temp Dir"
+msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
+
+#: cps/converter.py:32
+msgid "not configured"
+msgstr "δεν διαμορφώθηκε"
+
+#: cps/converter.py:34
+msgid "Execution permissions missing"
+msgstr "Λείπουν άδειες εκτέλεσης"
+
+#: cps/editbooks.py:273 cps/editbooks.py:275
+msgid "Book Format Successfully Deleted"
+msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
+
+#: cps/editbooks.py:282 cps/editbooks.py:284
+msgid "Book Successfully Deleted"
+msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
+
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
+msgid "Error opening eBook. File does not exist or file is not accessible"
+msgstr "Σφάλμα ανοίγματος eBook. Το αρχείο δεν υπάρχει ή το αρχείο δεν είναι προσβάσιμο"
+
+#: cps/editbooks.py:327
+msgid "edit metadata"
+msgstr "επεξεργασία μεταδεδομένων"
+
+#: cps/editbooks.py:402
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
+
+#: cps/editbooks.py:513 cps/editbooks.py:769
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
+
+#: cps/editbooks.py:517 cps/editbooks.py:773
+msgid "File to be uploaded must have an extension"
+msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
+
+#: cps/editbooks.py:529
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
+
+#: cps/editbooks.py:534
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
+
+#: cps/editbooks.py:552 cps/editbooks.py:904
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
+
+#: cps/editbooks.py:556
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
+
+#: cps/editbooks.py:673
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
+
+#: cps/editbooks.py:710
+msgid "Metadata successfully updated"
+msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
+
+#: cps/editbooks.py:719
+msgid "Error editing book, please check logfile for details"
+msgstr "Σφάλμα επεξεργασίας βιβλίου, παρακαλούμε έλεγξε το φύλλο καταγραφής για λεπτομέρειες"
+
+#: cps/editbooks.py:781
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
+
+#: cps/editbooks.py:791
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
+
+#: cps/editbooks.py:879
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
+
+#: cps/editbooks.py:890
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "Το αρχείο %(file)s ανέβηκε"
+
+#: cps/editbooks.py:916
+msgid "Source or destination format for conversion missing"
+msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
+
+#: cps/editbooks.py:924
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
+
+#: cps/editbooks.py:928
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
+
+#: cps/gdrive.py:60
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, προσπάθησε να απενεργοποιήσεις και να ενεργοποιήσεις ξανά το Google Drive"
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Η ανάκληση ονόματος δεν έχει επαληθευτεί, παρακαλούμε ακολούθησε τα βήματα για την επαλήθευση ονόματος στην κονσόλα προγραμματιστή google"
+
+#: cps/helper.py:79
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s η δομή δεν βρέθηκε για την ταυτότητα βιβλίου: %(book)d"
+
+#: cps/helper.py:85 cps/tasks/convert.py:50
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s δεν βρέθηκε στο Google Drive: %(fn)s"
+
+#: cps/helper.py:90
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s δεν βρέθηκε: %(fn)s"
+
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Αποστολή στο Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Αυτό το e-mail έχει σταλεί μέσω Calibre-Web."
+
+#: cps/helper.py:110
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web δοκιμαστικό e-mail"
+
+#: cps/helper.py:111
+msgid "Test e-mail"
+msgstr "Δοκιμαστικό e-mail"
+
+#: cps/helper.py:128
+msgid "Get Started with Calibre-Web"
+msgstr "Ξεκινήστε με το Calibre-Web"
+
+#: cps/helper.py:133
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "e-mail εγγραφής για χρήστη: %(name)s"
+
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "Αποστολή %(format)s στο Kindle"
+
+#: cps/helper.py:183 cps/helper.py:189
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "Μετατροπή %(orig)s σε %(format)s και αποστολή στο Kindle"
+
+#: cps/helper.py:230
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "E-mail: %(book)s"
+
+#: cps/helper.py:232
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Το αρχείου που χητήθηκε δεν μπορεί να διαβαστεί. Μπορεί να υπάρχουν λαθασμένες άδειες;"
+
+#: cps/helper.py:329
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "Η διαγραφή φακέλου βιβλίου για το βιβλίο %(id)s απέτυχε, η πορεία έχει υπό-φακέλους: %(path)s"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "Η διαγραφή βιβλίου %(id)s απέτυχε: %(message)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Deleting book %(id)s, book path not valid: %(path)s"
+msgstr "Διαγραφή βιβλίου %(id)s, η πορεία βιβλίου δεν είναι έγκυρη: %(path)s"
+
+#: cps/helper.py:400
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Η μετονομασία τίτλου από: '%(src)s' σε '%(dest)s' απέτυχε με σφάλμα: %(error)s"
+
+#: cps/helper.py:415
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Η μετονομασία αρχείου σε πορεία '%(src)s' σε '%(dest)s' απέτυχε με σφάλμα: %(error)s"
+
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
+
+#: cps/helper.py:479
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
+
+#: cps/helper.py:588
+msgid "Error Downloading Cover"
+msgstr "Σφάλμα Κατεβάσματος Φόντου"
+
+#: cps/helper.py:591
+msgid "Cover Format Error"
+msgstr "Σφάλμα Μορφής Φόντου"
+
+#: cps/helper.py:606
+msgid "Failed to create path for cover"
+msgstr "Αποτυχία δημιουργίας πορείας για φόντο"
+
+#: cps/helper.py:611
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "Το αρχείο φόντου δεν είναι ένα έγκυρο αρχείο εικόνας, ή δεν μπόρεσε να αποθηκευτεί"
+
+#: cps/helper.py:622
+msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+msgstr "Μόνο jpg/jpeg/png/webp αρχεία υποστηρίζονται ως αρχεία φόντου"
+
+#: cps/helper.py:636
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "Μόνο jpg/jpeg αρχεία υποστηρίζονται ως αρχεία φόντου"
+
+#: cps/helper.py:684
+msgid "Unrar binary file not found"
+msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
+
+#: cps/helper.py:698
+msgid "Error excecuting UnRar"
+msgstr "Σφάλμα εκτέλεσης UnRar"
+
+#: cps/helper.py:747
+msgid "Waiting"
+msgstr "Αναμονή"
+
+#: cps/helper.py:749
+msgid "Failed"
+msgstr "Απέτυχε"
+
+#: cps/helper.py:751
+msgid "Started"
+msgstr "Ξεκίνησε"
+
+#: cps/helper.py:753
+msgid "Finished"
+msgstr "Τελείωσε"
+
+#: cps/helper.py:755
+msgid "Unknown Status"
+msgstr "ʼΑγνωστη κατάσταση"
+
+#: cps/kobo_auth.py:130
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr "Παρακαλούμε λάβε πρόσβαση στο calibre-web από ένα μη τοπικό εξηπηρετητή για να λάβεις μια έγκυρη api_endpoint για συσκευή kobo"
+
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+msgid "Kobo Setup"
+msgstr "Καθορισμός Kobo"
+
+#: cps/oauth_bb.py:73
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "Εγγραφή με %(provider)s"
+
+#: cps/oauth_bb.py:154
+msgid "Failed to log in with GitHub."
+msgstr "Αποτυχία σύνδεσης με GitHub."
+
+#: cps/oauth_bb.py:159
+msgid "Failed to fetch user info from GitHub."
+msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το GitHub."
+
+#: cps/oauth_bb.py:170
+msgid "Failed to log in with Google."
+msgstr "Αποτυχία σύνδεσης με το Google."
+
+#: cps/oauth_bb.py:175
+msgid "Failed to fetch user info from Google."
+msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το Google."
+
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
+
+#: cps/oauth_bb.py:235
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "Η Σύνδεση στο %(oauth)s Πέτυχε"
+
+#: cps/oauth_bb.py:241
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "Η σύνδεση απέτυχε, Δεν Υπάρχει Συνδεδεμένος Χρήστης Με Λογαριασμό OAuth"
+
+#: cps/oauth_bb.py:283
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Πέτυχε"
+
+#: cps/oauth_bb.py:287
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Απέτυχε"
+
+#: cps/oauth_bb.py:290
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "Δεν Είναι Συνδεδεμένο με το %(oauth)s"
+
+#: cps/oauth_bb.py:318
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
+
+#: cps/oauth_bb.py:337
+msgid "Google Oauth error, please retry later."
+msgstr "Google Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
+
+#: cps/shelf.py:67 cps/shelf.py:120
+msgid "Invalid shelf specified"
+msgstr "Διευκρινίστηκε μη έγκυρο ράφι"
+
+#: cps/shelf.py:73
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "Συγγνώμη δεν σου επιτρέπεται να προσθέσεις ένα βιβλίο στο ράφι: %(shelfname)s"
+
+#: cps/shelf.py:83
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Το βιβλίο είναι ήδη μέρος αυτού του ραφιού: %(shelfname)s"
+
+#: cps/shelf.py:106
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Το βιβλίο έχει προστεθεί στο ράφι: %(sname)s"
+
+#: cps/shelf.py:124
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Δεν σου επιτρέπεται να προσθέσεις ένα βιβλίο στο ράφι: %(name)s"
+
+#: cps/shelf.py:142
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Τα βιβλία είναι ήδη μέρος του ραφιού: %(name)s"
+
+#: cps/shelf.py:158
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Βιβλία είχαν προστεθεί στο ραφι: %(sname)s"
+
+#: cps/shelf.py:163
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Δεν μπόρεσε να γίνει η προσθήκη βιβλίων στο ράφι: %(sname)s"
+
+#: cps/shelf.py:208
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sname)s"
+
+#: cps/shelf.py:216
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Συγγνώμη αλλά δεν σου επιτρέπεται η αφαίρεση ενός βιβλίου από αυτό το ράφι: %(sname)s"
+
+#: cps/shelf.py:240 cps/shelf.py:284
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:249 cps/shelf.py:294
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:256
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Το ράφι %(title)s δημιουργήθηκε"
+
+#: cps/shelf.py:263 cps/shelf.py:312
+msgid "There was an error"
+msgstr "Υπήρξε ένα σφάλμα"
+
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Δημιούργησε ένα Ράφι"
+
+#: cps/shelf.py:306
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Το ράφι %(title)s άλλαξε"
+
+#: cps/shelf.py:313 cps/shelf.py:315
+msgid "Edit a shelf"
+msgstr "Επεξεργασία ενός ραφιού"
+
+#: cps/shelf.py:369
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Ράφι: '%(name)s"
+
+#: cps/shelf.py:372
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
+
+#: cps/shelf.py:409
+msgid "Hidden Book"
+msgstr "Κρυμμένο Βιβλίο"
+
+#: cps/shelf.py:414
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
+
+#: cps/ub.py:68
+msgid "Recently Added"
+msgstr "Προστέθηκε Πρόσφατα"
+
+#: cps/ub.py:70
+msgid "Show recent books"
+msgstr "Προβολή πρόσφατων βιβλίων"
+
+#: cps/templates/index.xml:17 cps/ub.py:71
+msgid "Hot Books"
+msgstr "Βιβλία στη Μόδα"
+
+#: cps/ub.py:73
+msgid "Show Hot Books"
+msgstr "Προβολή Βιβλίων στη Μόδα"
+
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr "Κατεβασμένα Βιβλία"
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr "Προβολή Κατεβασμένων Βιβλίων"
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
+msgid "Top Rated Books"
+msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
+
+#: cps/ub.py:81
+msgid "Show Top Rated Books"
+msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
+msgid "Read Books"
+msgstr "Βιβλία που Διαβάστηκαν"
+
+#: cps/ub.py:84
+msgid "Show read and unread"
+msgstr "Προβολή διαβασμένων και αδιάβαστων"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
+msgid "Unread Books"
+msgstr "Βιβλία που δεν Διαβάστηκαν"
+
+#: cps/ub.py:88
+msgid "Show unread"
+msgstr "Προβολή αδιάβαστων"
+
+#: cps/ub.py:89
+msgid "Discover"
+msgstr "Ανακάλυψε"
+
+#: cps/ub.py:91
+msgid "Show random books"
+msgstr "Προβολή τυχαίων βιβλίων"
+
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#: cps/ub.py:94
+msgid "Show category selection"
+msgstr "Προβολή επιλογών κατηγορίας"
+
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
+msgid "Series"
+msgstr "Σειρές"
+
+#: cps/ub.py:97
+msgid "Show series selection"
+msgstr "Προβολή επιλογών σειράς"
+
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
+msgid "Authors"
+msgstr "Συγγραφείς"
+
+#: cps/ub.py:100
+msgid "Show author selection"
+msgstr "Προβολή επιλογών συγγραφέα"
+
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
+msgid "Publishers"
+msgstr "Εκδότες"
+
+#: cps/ub.py:104
+msgid "Show publisher selection"
+msgstr "Προβολή επιλογών εκδότη"
+
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
+msgid "Languages"
+msgstr "Γλώσσες"
+
+#: cps/ub.py:108
+msgid "Show language selection"
+msgstr "Προβολή επιλογών γλώσσας"
+
+#: cps/templates/index.xml:96 cps/ub.py:109
+msgid "Ratings"
+msgstr "Αξιολογήσεις"
+
+#: cps/ub.py:111
+msgid "Show ratings selection"
+msgstr "Προβολή επιλογών αξιολόγησης"
+
+#: cps/templates/index.xml:104 cps/ub.py:112
+msgid "File formats"
+msgstr "Μορφές αρχείου"
+
+#: cps/ub.py:114
+msgid "Show file formats selection"
+msgstr "Προβολή επιλογών μορφής αρχείου"
+
+#: cps/ub.py:116 cps/web.py:927
+msgid "Archived Books"
+msgstr "Αρχειοθετημένα Βιβλία"
+
+#: cps/ub.py:118
+msgid "Show archived books"
+msgstr "Προβολή αρχειοθετημένων βιβλίων"
+
+#: cps/ub.py:120
+msgid "Books List"
+msgstr "Λίστα Βιβλίων"
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr "Προβολή Λίστας Βιβλίων"
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
+msgid "Unexpected data while reading update information"
+msgstr "Απρόβλεπτα δεδομένα κατά την ανάγνωση των πληροφοριών ενημέρωσης"
+
+#: cps/updater.py:302 cps/updater.py:413
+msgid "No update available. You already have the latest version installed"
+msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση. Έχεις ήδη την τελευταία έκδοση εγκατεστημένη"
+
+#: cps/updater.py:334
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία έκδοση."
+
+#: cps/updater.py:386
+msgid "Could not fetch update information"
+msgstr "Δεν μπόρεσε να συγκεντρώσει τις πληροφορίες ενημέρωσης"
+
+#: cps/updater.py:400
+msgid "No release information available"
+msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες αποδέσμευσης"
+
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε κλικ στο κουμπί πιο κάτω για ενημέρωση με την έκδοση: %(version)s"
+
+#: cps/updater.py:478
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία σταθερή έκδοση."
+
+#: cps/web.py:316
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Σφάλμα: %(ldaperror)s"
+
+#: cps/web.py:320
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
+
+#: cps/web.py:368
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
+
+#: cps/web.py:371
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
+
+#: cps/web.py:373
+msgid "User Successfully Imported"
+msgstr "Ο Χρήστης Εισήχθει Επιτυχώς"
+
+#: cps/templates/index.html:5 cps/web.py:647
+msgid "Discover (Random Books)"
+msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
+
+#: cps/web.py:686
+msgid "Books"
+msgstr "Βιβλία"
+
+#: cps/web.py:713
+msgid "Hot Books (Most Downloaded)"
+msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
+
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Κατεβασμένα βιβλία από %(user)s"
+
+#: cps/web.py:762
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
+
+#: cps/web.py:776
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Συγγραφέας: %(name)s"
+
+#: cps/web.py:790
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Εκδότης: %(name)s"
+
+#: cps/web.py:803
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Σειρές: %(serie)s"
+
+#: cps/web.py:816
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Αξιολόγηση: %(rating)s stars"
+
+#: cps/web.py:829
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Μορφή αρχείου: %(format)s"
+
+#: cps/web.py:843
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Κατηγορία: %(name)s"
+
+#: cps/web.py:862
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Γλώσσα: %(name)s"
+
+#: cps/web.py:891
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
+
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Προχωρημένη Αναζήτηση"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr "Λίστα βιβλίων"
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Λίστα αξιολογήσεων"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Λίστα μορφών αρχείου"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Εκδόθηκε μετά"
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Εκδόθηκε πριν"
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Αξιολόγηση <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Αξιολόγηση >= %(rating)s"
+
+#: cps/web.py:1472
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
+
+#: cps/web.py:1476
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
+
+#: cps/web.py:1478
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
+
+#: cps/web.py:1495
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
+
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
+msgid "register"
+msgstr "εγγραφή"
+
+#: cps/web.py:1532
+msgid "Your e-mail is not allowed to register"
+msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
+
+#: cps/web.py:1535
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
+
+#: cps/web.py:1538
+msgid "This username or e-mail address is already in use."
+msgstr "Αυτό το όνομα χρήστη ή η διεύθυνση e-mail είναι ήδη σε χρήση."
+
+#: cps/web.py:1555
+msgid "Cannot activate LDAP authentication"
+msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
+
+#: cps/web.py:1572
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
+
+#: cps/web.py:1578
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
+
+#: cps/web.py:1582 cps/web.py:1606
+msgid "Wrong Username or Password"
+msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
+
+#: cps/web.py:1589
+msgid "New Password was send to your email address"
+msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
+
+#: cps/web.py:1595
+msgid "Please enter valid username to reset password"
+msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
+
+#: cps/web.py:1601
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
+
+#: cps/web.py:1612 cps/web.py:1639
+msgid "login"
+msgstr "σύνδεση"
+
+#: cps/web.py:1651 cps/web.py:1685
+msgid "Token not found"
+msgstr "Η μάρκα δεν βρέθηκε"
+
+#: cps/web.py:1660 cps/web.py:1693
+msgid "Token has expired"
+msgstr "Η μάρκα έχει λήξει"
+
+#: cps/web.py:1669
+msgid "Success! Please return to your device"
+msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
+
+#: cps/web.py:1753 cps/web.py:1809
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s's προφίλ"
+
+#: cps/web.py:1789
+msgid "Profile updated"
+msgstr "Το προφίλ ενημερώθηκε"
+
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
+msgid "Read a Book"
+msgstr "Διάβασε ένα Βιβλίο"
+
+#: cps/tasks/convert.py:103
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Το εργαλείο μετατροπής Calibre ebook %(tool)s δεν βρέθηκε"
+
+#: cps/tasks/convert.py:127
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s μορφή δεν βρέθηκε σε δίσκο"
+
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr "Ο μετατροπέας Ebook απέτυχε με άγνωστο σφάλμα"
+
+#: cps/tasks/convert.py:140
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Ο μετατροπέας Kepubify απέτυχε: %(error)s"
+
+#: cps/tasks/convert.py:164
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υπάρχουν περισσότερα από ένα αρχεία στο φάκελο %(folder)s"
+
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "Χρήστες"
+
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:8
+#: cps/templates/user_edit.html:9
+msgid "Username"
+msgstr "Όνομα Χρήστη"
+
+#: cps/templates/admin.html:13 cps/templates/register.html:13
+#: cps/templates/user_edit.html:14
+msgid "E-mail Address"
+msgstr "Διεύθυνση E-mail"
+
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:27
+msgid "Send to Kindle E-mail Address"
+msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
+
+#: cps/templates/admin.html:15
+msgid "Downloads"
+msgstr "Κατεβασμένα"
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:77
+msgid "Admin"
+msgstr "Διαχειριστής"
+
+#: cps/templates/admin.html:17 cps/templates/login.html:12
+#: cps/templates/login.html:13 cps/templates/user_edit.html:22
+msgid "Password"
+msgstr "Κωδικός"
+
+#: cps/templates/admin.html:18 cps/templates/layout.html:66
+msgid "Upload"
+msgstr "Ανέβασμα"
+
+#: cps/templates/admin.html:19 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:70
+msgid "Download"
+msgstr "Κατέβασμα"
+
+#: cps/templates/admin.html:20
+msgid "View Books"
+msgstr "Προβολή Βιβλίων"
+
+#: cps/templates/admin.html:21
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: cps/templates/admin.html:22 cps/templates/book_edit.html:16
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: cps/templates/admin.html:23
+msgid "Public Shelf"
+msgstr "Δημόσιο Ράφι"
+
+#: cps/templates/admin.html:44
+msgid "Add New User"
+msgstr "Προσθήκη Νέου Χρήστη"
+
+#: cps/templates/admin.html:46 cps/templates/admin.html:47
+msgid "Import LDAP Users"
+msgstr "Εισαγωγή Χρηστών LDAP"
+
+#: cps/templates/admin.html:54
+msgid "E-mail Server Settings"
+msgstr "Ρυθμίσεις E-mail Διακομιστή"
+
+#: cps/templates/admin.html:57 cps/templates/email_edit.html:11
+msgid "SMTP Hostname"
+msgstr "Όνομα Εξυπηρετητή SMTP"
+
+#: cps/templates/admin.html:58 cps/templates/email_edit.html:15
+msgid "SMTP Port"
+msgstr "SMTP Θύρα"
+
+#: cps/templates/admin.html:59 cps/templates/email_edit.html:19
+msgid "Encryption"
+msgstr "Κρυπτογράφηση"
+
+#: cps/templates/admin.html:60 cps/templates/email_edit.html:27
+msgid "SMTP Login"
+msgstr "Σύνδεση SMTP"
+
+#: cps/templates/admin.html:61 cps/templates/email_edit.html:35
+msgid "From E-mail"
+msgstr "Από E-mail"
+
+#: cps/templates/admin.html:77
+msgid "Configuration"
+msgstr "Διαμόρφωση"
+
+#: cps/templates/admin.html:80
+msgid "Calibre Database Directory"
+msgstr "Ευρετήριο Βάσης Δεδομένων Calibre"
+
+#: cps/templates/admin.html:84 cps/templates/config_edit.html:129
+msgid "Log Level"
+msgstr "Επίπεδο Φύλλου Καταγραφής"
+
+#: cps/templates/admin.html:88
+msgid "Port"
+msgstr "Θύρα"
+
+#: cps/templates/admin.html:93
+msgid "External Port"
+msgstr "Εξωτερική Θύρα"
+
+#: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
+msgstr "Βιβλία ανά Σελίδα"
+
+#: cps/templates/admin.html:104
+msgid "Uploads"
+msgstr "Ανεβάσμένα"
+
+#: cps/templates/admin.html:108
+msgid "Anonymous Browsing"
+msgstr "Ανώνυμη Περιήγηση"
+
+#: cps/templates/admin.html:112
+msgid "Public Registration"
+msgstr "Δημόσια Εγγραφή"
+
+#: cps/templates/admin.html:116
+msgid "Magic Link Remote Login"
+msgstr "Μαγικός Σύνδεσμος Απομακρυσμένης Σύνδεσης"
+
+#: cps/templates/admin.html:120
+msgid "Reverse Proxy Login"
+msgstr "Αναστροφή Σύνδεσης Διακομιστή Μεσολάβησης"
+
+#: cps/templates/admin.html:125
+msgid "Reverse proxy header name"
+msgstr "Όνομα επικεφαλίδας αναστροφής διακομιστή μεσολάβησης"
+
+#: cps/templates/admin.html:130
+msgid "Edit Basic Configuration"
+msgstr "Επεξεργασία Βασικής Διαμόρφωσης"
+
+#: cps/templates/admin.html:131
+msgid "Edit UI Configuration"
+msgstr "Επεξεργασία Διαμόρφωσης UI"
+
+#: cps/templates/admin.html:137
+msgid "Administration"
+msgstr "Διοίκηση"
+
+#: cps/templates/admin.html:138
+msgid "View Logs"
+msgstr "Προβολή Φύλλων Καταγραφής"
+
+#: cps/templates/admin.html:139
+msgid "Reconnect Calibre Database"
+msgstr "Επανασύνδεση Βάσης Δεδομένων Calibre"
+
+#: cps/templates/admin.html:140
+msgid "Restart"
+msgstr "Επανεκκίνηση"
+
+#: cps/templates/admin.html:141
+msgid "Shutdown"
+msgstr "Κλείσιμο"
+
+#: cps/templates/admin.html:147
+msgid "Update"
+msgstr "Ενημέρωση"
+
+#: cps/templates/admin.html:151
+msgid "Version"
+msgstr "Έκδοση"
+
+#: cps/templates/admin.html:152
+msgid "Details"
+msgstr "Λεπτομέρειες"
+
+#: cps/templates/admin.html:158
+msgid "Current version"
+msgstr "Τρέχουσα έκδοση"
+
+#: cps/templates/admin.html:164
+msgid "Check for Update"
+msgstr "Έλεγχος για Ενημέρωση"
+
+#: cps/templates/admin.html:165
+msgid "Perform Update"
+msgstr "Πραγματοποίηση Ενημέρωσης"
+
+#: cps/templates/admin.html:177
+msgid "Are you sure you want to restart?"
+msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις επανεκκίνηση"
+
+#: cps/templates/admin.html:182 cps/templates/admin.html:196
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
+msgid "OK"
+msgstr "OK"
+
+#: cps/templates/admin.html:183 cps/templates/admin.html:197
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
+#: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: cps/templates/admin.html:195
+msgid "Are you sure you want to shutdown?"
+msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
+
+#: cps/templates/admin.html:207
+msgid "Updating, please do not reload this page"
+msgstr "Γίνεται ενημέρωση, παρακαλούμε μη φορτώσεις ξανά αυτή τη σελίδα"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "μέσω"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "Στη Βιβλιοθήκη"
+
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
+msgid "All"
+msgstr "Όλα"
+
+#: cps/templates/author.html:58 cps/templates/author.html:118
+#: cps/templates/discover.html:27 cps/templates/index.html:26
+#: cps/templates/index.html:97 cps/templates/search.html:60
+#: cps/templates/shelf.html:36
+msgid "reduce"
+msgstr "μείωση"
+
+#: cps/templates/author.html:102
+msgid "More by"
+msgstr "Περισσότερα από"
+
+#: cps/templates/book_edit.html:10
+msgid "Delete Book"
+msgstr "Διαγραφή Βιβλίου"
+
+#: cps/templates/book_edit.html:13
+msgid "Delete formats:"
+msgstr "Διαγραφή μορφών:"
+
+#: cps/templates/book_edit.html:24
+msgid "Convert book format:"
+msgstr "Μετατροπή μορφής βιβλίου:"
+
+#: cps/templates/book_edit.html:28
+msgid "Convert from:"
+msgstr "Μετατροπή από:"
+
+#: cps/templates/book_edit.html:30 cps/templates/book_edit.html:37
+msgid "select an option"
+msgstr "διάλεξε μια επιλογή"
+
+#: cps/templates/book_edit.html:35
+msgid "Convert to:"
+msgstr "Μετατροπή σε:"
+
+#: cps/templates/book_edit.html:44
+msgid "Convert book"
+msgstr "Μετατροπή βιβλίου"
+
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
+msgid "Book Title"
+msgstr "Τίτλος Βιβλίου"
+
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+msgid "Author"
+msgstr "Συγγραφέας"
+
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: cps/templates/book_edit.html:66
+msgid "Identifiers"
+msgstr "Αναγνωριστικά"
+
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+msgid "Identifier Type"
+msgstr "Είδος Αναγνωριστικού"
+
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+msgid "Identifier Value"
+msgstr "Τιμή Αναγνωριστικού"
+
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: cps/templates/book_edit.html:76
+msgid "Add Identifier"
+msgstr "Προσθήκη Αναγνωριστικού"
+
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+msgid "Tags"
+msgstr "Ετικέτες"
+
+#: cps/templates/book_edit.html:88
+msgid "Series ID"
+msgstr "Ταυτότητα Σειράς"
+
+#: cps/templates/book_edit.html:92
+msgid "Rating"
+msgstr "Αξιολόγηση"
+
+#: cps/templates/book_edit.html:98
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "Συγκέντρωση Εξώφυλλου από URL (JPEG - Η εικόνα θα κατέβει και θα αποθηκευτεί σε βάση δεδομένων)"
+
+#: cps/templates/book_edit.html:102
+msgid "Upload Cover from Local Disk"
+msgstr "Ανέβασμα Εξώφυλλου από Τοπικό Δίσκο"
+
+#: cps/templates/book_edit.html:109
+msgid "Published Date"
+msgstr "Ημερομηνία Έκδοσης"
+
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
+msgid "Publisher"
+msgstr "Εκδότης"
+
+#: cps/templates/book_edit.html:120 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:32
+msgid "Language"
+msgstr "Γλώσσα"
+
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+msgid "Yes"
+msgstr "Ναι"
+
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+msgid "No"
+msgstr "Όχι"
+
+#: cps/templates/book_edit.html:178
+msgid "Upload Format"
+msgstr "Μορφή Ανεβάσματος"
+
+#: cps/templates/book_edit.html:187
+msgid "View Book on Save"
+msgstr "Προβολή Βιβλίου σε Αποθήκευση"
+
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+msgid "Fetch Metadata"
+msgstr "Συγκέντρωση Μεταδεδομένων"
+
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:388
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:45
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:137
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: cps/templates/book_edit.html:210
+msgid "Keyword"
+msgstr "Λέξη κλειδί"
+
+#: cps/templates/book_edit.html:211
+msgid " Search keyword "
+msgstr "Αναζήτηση λέξης κλειδιού"
+
+#: cps/templates/book_edit.html:217
+msgid "Click the cover to load metadata to the form"
+msgstr "Κάνε κλικ στο εξώφυλλο για φόρτωση μεταδεδομένων στη φόρμα"
+
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+msgid "Loading..."
+msgstr "Φόρτωση..."
+
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
+msgid "Close"
+msgstr "Κλείσιμο"
+
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+msgid "Source"
+msgstr "Πηγή"
+
+#: cps/templates/book_edit.html:273
+msgid "Search error!"
+msgstr "Σφάλμα αναζήτησης!"
+
+#: cps/templates/book_edit.html:274
+msgid "No Result(s) found! Please try another keyword."
+msgstr "Δεν βρέθηκε(αν) αποτέλεσμα(τα)! Παρακαλούμε δοκίμασε μια άλλη λέξη κλειδί."
+
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "Αυτό το Πεδίο Απαιτείται"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "Συγχώνευση επιλεγμένων βιβλίων"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "Αφαίρεση Επιλογών"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "Ενημέρωση Ταξινόμησης Τίτλων αυτόματα"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "Ενημέρωση Ταξινίμησης Συγγραφέα αυτόματα"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "Εισαγωγή Τίτλου"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Τίτλος"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr "Εισαγωγή Ταξινόμησης Τίτλου"
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr "Ταξινόμηση Τίτλου"
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr "Εισαγωγή Ταξινόμησης Συγγραφέας"
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr "Ταξινόμηση Συγγραφέα"
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr "Εισαγωγή Συγγραφέων"
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr "Εισαγωγή Κατηγοριών"
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr "Εισαγωγή Σειρών"
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr "Εισαγωγή τίτλου"
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr "Ευρετήριο Σειρών"
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr "Εισαγωγή Γλωσσών"
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr "Ημερομηνία Έκδοσης"
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr "Εισαγωγή Εκδοτών"
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Είσαι πραγματικά σίγουρος/η;"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr "Βιβλία με Τίτλους θα ενωθούν από:"
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr "Μέσα σε Βιβλίο με Τίτλο:"
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "Συγχώνευση"
+
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr "Διαμόρφωση Βιβλιοθήκης"
+
+#: cps/templates/config_edit.html:19
+msgid "Location of Calibre Database"
+msgstr "Τοποθεσία Βάσης Δεδομένων Calibre"
+
+#: cps/templates/config_edit.html:28
+msgid "Use Google Drive?"
+msgstr "Χρήση Google Drive;"
+
+#: cps/templates/config_edit.html:34
+msgid "Google Drive config problem"
+msgstr "Google Drive πρόβλημα διαμόρφωσης"
+
+#: cps/templates/config_edit.html:40
+msgid "Authenticate Google Drive"
+msgstr "Πιστοποίηση αυθεντικότητας Google Drive"
+
+#: cps/templates/config_edit.html:44
+msgid "Please hit save to continue with setup"
+msgstr "Παρακαλούμε επέλεξε αποθήκευση για να συνεχίσεις με τον καθορισμό"
+
+#: cps/templates/config_edit.html:47
+msgid "Please finish Google Drive setup after login"
+msgstr "Παρακαλούμε ολοκλήρωσε τον καθορισμό του Google Drive μετά τη σύνδεση"
+
+#: cps/templates/config_edit.html:52
+msgid "Google Drive Calibre folder"
+msgstr "Αρχείο Google Drive Calibre"
+
+#: cps/templates/config_edit.html:60
+msgid "Metadata Watch Channel ID"
+msgstr "Ταυτότητα Καναλιού Προβολής Μεταδεδομένων"
+
+#: cps/templates/config_edit.html:63
+msgid "Revoke"
+msgstr "Αναίρεση"
+
+#: cps/templates/config_edit.html:83
+msgid "Server Configuration"
+msgstr "Διαμόρφωση Διακομιστή"
+
+#: cps/templates/config_edit.html:90
+msgid "Server Port"
+msgstr "Θύρα Διακομιστή"
+
+#: cps/templates/config_edit.html:93
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "Τοποθεσία πιστοποιητικού SSL (αφήστε το κενό για Διακομιστές που δεν είναι SSL)"
+
+#: cps/templates/config_edit.html:100
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "Τοποθεσία αρχείου κλειδιού SSL (αφήστε το κενό για Διακομιστές που δεν είναι SSL)"
+
+#: cps/templates/config_edit.html:108
+msgid "Update Channel"
+msgstr "Ενημέρωση Καναλιού"
+
+#: cps/templates/config_edit.html:110
+msgid "Stable"
+msgstr "Σταθερό"
+
+#: cps/templates/config_edit.html:111
+msgid "Nightly"
+msgstr "Νυχτερινό"
+
+#: cps/templates/config_edit.html:122
+msgid "Logfile Configuration"
+msgstr "Διαμόρφωση αρχείου καταγραφής"
+
+#: cps/templates/config_edit.html:138
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "Τοποθεσία και όνομα αρχείου φύλλου καταγραφής (calibre-web.log για καμία καταχώρηση)"
+
+#: cps/templates/config_edit.html:143
+msgid "Enable Access Log"
+msgstr "Ενεργοποίηση Πρόσβασης Φύλλου Καταγραφής"
+
+#: cps/templates/config_edit.html:146
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "Τοποθεσία και όνομα πρόσβασης αρχείου φύλλου καταγραφής (access.log για καμία καταχώρηση)"
+
+#: cps/templates/config_edit.html:157
+msgid "Feature Configuration"
+msgstr "Διαμόρφωση Λειτουργίας"
+
+#: cps/templates/config_edit.html:165
+msgid "Enable Uploads"
+msgstr "Ενεργοποίηση Ανεβάσματος"
+
+#: cps/templates/config_edit.html:169
+msgid "Allowed Upload Fileformats"
+msgstr "Επιτρεπόμενες Μορφές Αρχείων για Ανέβασμα"
+
+#: cps/templates/config_edit.html:175
+msgid "Enable Anonymous Browsing"
+msgstr "Ενεργοποίηση Ανώνυμης Περιήγησης"
+
+#: cps/templates/config_edit.html:179
+msgid "Enable Public Registration"
+msgstr "Ενεργοποίηση Δημόσιας Εγγραφής"
+
+#: cps/templates/config_edit.html:184
+msgid "Use E-Mail as Username"
+msgstr "Χρήση E-Mail ως Όνομα Χρήστη"
+
+#: cps/templates/config_edit.html:189
+msgid "Enable Magic Link Remote Login"
+msgstr "Ενεργοποίηση Μαγικού Συνδέσμου Απομακρυσμένης Σύνδεσης"
+
+#: cps/templates/config_edit.html:194
+msgid "Enable Kobo sync"
+msgstr "Ενεργοποίηση συγχρονισμού Kobo"
+
+#: cps/templates/config_edit.html:199
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Proxy άγνωστα αιτήματα στο Κατάστημα Kobo"
+
+#: cps/templates/config_edit.html:202
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "Εξωτερική Θύρα Διακομιστή (για κλήσεις API προωθημένες στη θύρα)"
+
+#: cps/templates/config_edit.html:210
+msgid "Use Goodreads"
+msgstr "Χρήση Goodreads"
+
+#: cps/templates/config_edit.html:211
+msgid "Create an API Key"
+msgstr "Δημιουργία ενός Κλειδιού API"
+
+#: cps/templates/config_edit.html:215
+msgid "Goodreads API Key"
+msgstr "Goodreads Κλειδί API"
+
+#: cps/templates/config_edit.html:219
+msgid "Goodreads API Secret"
+msgstr "Goodreads Μυστικό API"
+
+#: cps/templates/config_edit.html:226
+msgid "Allow Reverse Proxy Authentication"
+msgstr "Να Επιτραπεί η Αναστροφή Επαλήθευσης Proxy"
+
+#: cps/templates/config_edit.html:230
+msgid "Reverse Proxy Header Name"
+msgstr "Αναστροφή Proxy Όνομα Επικεφαλίδας"
+
+#: cps/templates/config_edit.html:237
+msgid "Login type"
+msgstr "Είδος σύνδεσης"
+
+#: cps/templates/config_edit.html:239
+msgid "Use Standard Authentication"
+msgstr "Χρήση Στεθερής Επαλήθευσης"
+
+#: cps/templates/config_edit.html:241
+msgid "Use LDAP Authentication"
+msgstr "Χρήση Επαλήθευσης LDAP"
+
+#: cps/templates/config_edit.html:244
+msgid "Use OAuth"
+msgstr "Χρήση OAuth"
+
+#: cps/templates/config_edit.html:251
+msgid "LDAP Server Host Name or IP Address"
+msgstr "Όνομα Διακομιστή Φιλοξενίας LDAP ή Διεύθυνση IP"
+
+#: cps/templates/config_edit.html:255
+msgid "LDAP Server Port"
+msgstr "Θύρα Διακομιστή LDAP"
+
+#: cps/templates/config_edit.html:259
+msgid "LDAP Encryption"
+msgstr "LDAP Αποκρυπτογράφηση"
+
+#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Κανένα"
+
+#: cps/templates/config_edit.html:262
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:263
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:268
+msgid "LDAP Certificate Path"
+msgstr "LDAP Πιστοποιητικό Πορείας"
+
+#: cps/templates/config_edit.html:273
+msgid "LDAP Authentication"
+msgstr "LDAP Επαλήθευση"
+
+#: cps/templates/config_edit.html:275
+msgid "Anonymous"
+msgstr "Ανώνυμοι"
+
+#: cps/templates/config_edit.html:276
+msgid "Unauthenticated"
+msgstr "Μη επαληθεύσιμο"
+
+#: cps/templates/config_edit.html:277
+msgid "Simple"
+msgstr "Απλό"
+
+#: cps/templates/config_edit.html:282
+msgid "LDAP Administrator Username"
+msgstr "LDAP Όνομα Χρήστη Διαχειριστή"
+
+#: cps/templates/config_edit.html:288
+msgid "LDAP Administrator Password"
+msgstr "LDAP Κωδικός Διαχειριστή"
+
+#: cps/templates/config_edit.html:293
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP Χαρακτηριστικό Όνομα (ΧΟ)"
+
+#: cps/templates/config_edit.html:297
+msgid "LDAP User Object Filter"
+msgstr "LDAP Αντικείμενο Φίλτρου Χρήστη"
+
+#: cps/templates/config_edit.html:302
+msgid "LDAP Server is OpenLDAP?"
+msgstr "Είναι ο Διακομιστής LDAP OpenLDAP;"
+
+#: cps/templates/config_edit.html:304
+msgid "Following Settings are Needed For User Import"
+msgstr "Χρειάζονται οι Ακόλουθες Ρυθμίσεις για Εισαγωγη Χρήστη"
+
+#: cps/templates/config_edit.html:306
+msgid "LDAP Group Object Filter"
+msgstr "Αντικείμενο Φίλτρου Ομάδας LDAP"
+
+#: cps/templates/config_edit.html:310
+msgid "LDAP Group Name"
+msgstr "LDAP Όνομα Ομάδας"
+
+#: cps/templates/config_edit.html:314
+msgid "LDAP Group Members Field"
+msgstr "LDAP Πεδίο Μελών Ομάδας"
+
+#: cps/templates/config_edit.html:323
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "Απόκτηση %(provider)s OAuth Διαπιστευτήρια"
+
+#: cps/templates/config_edit.html:326
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "%(provider)s OAuth Ταυτότητα Πελάτη"
+
+#: cps/templates/config_edit.html:330
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth Μυστικό Πελάτη"
+
+#: cps/templates/config_edit.html:346
+msgid "External binaries"
+msgstr "Εξωτερικοί Δυαδικοί"
+
+#: cps/templates/config_edit.html:352
+msgid "Path to Calibre E-Book Converter"
+msgstr "Πορεία για το Μετατροπέα Calibre E-Book"
+
+#: cps/templates/config_edit.html:360
+msgid "Calibre E-Book Converter Settings"
+msgstr "Calibre E-Book Ρυθμίσεις Μετατροπέα"
+
+#: cps/templates/config_edit.html:363
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Πορεία για Μετατροπέα Kepubify E-Book"
+
+#: cps/templates/config_edit.html:371
+msgid "Location of Unrar binary"
+msgstr "Τοποθεσία δυαδικού Unrar"
+
+#: cps/templates/config_edit.html:394 cps/templates/layout.html:85
+#: cps/templates/login.html:4 cps/templates/login.html:20
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: cps/templates/config_view_edit.html:16
+msgid "View Configuration"
+msgstr "Προβολή Διαμόρφωσης"
+
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
+msgstr "Αριθμός Τυχαίων Βιβλίων για Εμφάνιση"
+
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "Αριθμός Συγγραφέων για Εμφάνιση Πριν την Απόκρυψη (0=Απενεργοποίηση Απόκρυψης)"
+
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
+msgid "Theme"
+msgstr "Θέμα"
+
+#: cps/templates/config_view_edit.html:41
+msgid "Standard Theme"
+msgstr "Σταθερό Θέμα"
+
+#: cps/templates/config_view_edit.html:42
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! Σκοτεινό θέμα"
+
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
+msgstr "Συνήθης Έφραση για  για να Αγνοηθούν Στήλες"
+
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "Σύνδεση Κατάστασης Διαβασμένο/Αδιάβαστο σε Στήλη Calibre"
+
+#: cps/templates/config_view_edit.html:59
+msgid "View Restrictions based on Calibre column"
+msgstr "Προβολή Περιορισμών με βάση τη στήλη Calibre"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Συνήθης Έκφραση για Ταξινόμηση Τίτλου"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
+msgstr "Προκαθορισμένες Ρυθμίσεις για Νέους Χρήστες"
+
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:94
+msgid "Admin User"
+msgstr "Χρήστης Διαχειριστής"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:99
+msgid "Allow Downloads"
+msgstr "Να Επιτρέπεται το Κατέβασμα"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:103
+msgid "Allow eBook Viewer"
+msgstr "Να Επιτρέπεται η Προβολή eBook Viewer"
+
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:107
+msgid "Allow Uploads"
+msgstr "Να Επιτρέπεται το Ανέβασμα"
+
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:111
+msgid "Allow Edit"
+msgstr "Να Επιτρέπεται η Επεξεργασία"
+
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:115
+msgid "Allow Delete Books"
+msgstr "Να Επιτρέπεται η Διαγραφή Βιβλίων"
+
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:120
+msgid "Allow Changing Password"
+msgstr "Να Επιτρέπεται η Αλλαγή Κωδικού"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:124
+msgid "Allow Editing Public Shelves"
+msgstr "Να Επιτρέπεται η Επεξεργασία Δημόσιων Ραφιών"
+
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
+msgstr "Προκαθορισμένες Ορατότηες για Νέους Χρήστες"
+
+#: cps/templates/config_view_edit.html:142 cps/templates/user_edit.html:82
+msgid "Show Random Books in Detail View"
+msgstr "Προβολή Τυχαίων Βιβλίων σε Προβολή Λεπτομερειών"
+
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:85
+msgid "Add Allowed/Denied Tags"
+msgstr "Προσθήκη ετικετών Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr "Προσθήκη τιμών ειδικά κατασκευασμένων στηλών Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/detail.html:59
+msgid "Read in Browser"
+msgstr "Διάβασε στο Πρόγραμμα Περιήγησης"
+
+#: cps/templates/detail.html:72
+msgid "Listen in Browser"
+msgstr "ʼΑκουσε στο Πρόγραμμα Περιήγησης"
+
+#: cps/templates/detail.html:117
+msgid "Book"
+msgstr "Βιβλίο"
+
+#: cps/templates/detail.html:117
+msgid "of"
+msgstr "από"
+
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr "Εκδόθηκε"
+
+#: cps/templates/detail.html:208
+msgid "Mark As Unread"
+msgstr "Σήμανση ως Αδιάβαστο"
+
+#: cps/templates/detail.html:208
+msgid "Mark As Read"
+msgstr "Σήμανση ως Διαβασμένο"
+
+#: cps/templates/detail.html:209
+msgid "Read"
+msgstr "Διαβάστηκε"
+
+#: cps/templates/detail.html:217
+msgid "Restore from archive"
+msgstr "Επαναφορά από το αρχείο"
+
+#: cps/templates/detail.html:217
+msgid "Add to archive"
+msgstr "Προσθήκη στο αρχείο"
+
+#: cps/templates/detail.html:218
+msgid "Archived"
+msgstr "Αρχειοθετήθηκε"
+
+#: cps/templates/detail.html:229
+msgid "Description:"
+msgstr "Περιγραφή"
+
+#: cps/templates/detail.html:242 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "Προσθήκη στο ράφι"
+
+#: cps/templates/detail.html:253 cps/templates/detail.html:270
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
+#: cps/templates/search.html:20
+msgid "(Public)"
+msgstr "(Δημόσιο)"
+
+#: cps/templates/detail.html:284
+msgid "Edit Metadata"
+msgstr "Επεξεργασία Μεταδεδομένων"
+
+#: cps/templates/email_edit.html:22
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:23
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:31
+msgid "SMTP Password"
+msgstr "SMTP Κωδικός"
+
+#: cps/templates/email_edit.html:38
+msgid "Attachment Size Limit"
+msgstr "Όριο Μεγέθους Επισύναψης"
+
+#: cps/templates/email_edit.html:46
+msgid "Save and Send Test E-mail"
+msgstr "Αποθήκευση και Αποστολή E-mail Δοκιμής"
+
+#: cps/templates/email_edit.html:51
+msgid "Allowed Domains (Whitelist)"
+msgstr "Επιτρεπόμενα Domains (Λευκή λίστα)"
+
+#: cps/templates/email_edit.html:54 cps/templates/email_edit.html:80
+msgid "Add Domain"
+msgstr "Προσθήκη Domain"
+
+#: cps/templates/email_edit.html:57 cps/templates/email_edit.html:83
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: cps/templates/email_edit.html:62 cps/templates/email_edit.html:72
+msgid "Enter domainname"
+msgstr "Όνομα domain"
+
+#: cps/templates/email_edit.html:68
+msgid "Denied Domains (Blacklist)"
+msgstr "Domains που Απορρίφθηκαν (Μαύρη λίστα)"
+
+#: cps/templates/email_edit.html:99
+msgid "Are you sure you want to delete this domain?"
+msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το domain;"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+msgid "Next"
+msgstr "Επόμενο"
+
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "ʼΑνοιξε το .kobo/Kobo eReader.conf αρχείο σε πρόγραμμα επεξεργασίας κειμένου και πρόσθεσε (ή κάνε επεξεργασία):"
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr "Δημιουργία Θέματος"
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
+msgstr "Επιστροφή στην Κεντρική"
+
+#: cps/templates/index.html:72
+msgid "Group by series"
+msgstr "Ομαδοποίηση ανά Σειρές"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "Έναρξη"
+
+#: cps/templates/index.xml:21
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "Δημοφιλείς εκδόσεις από αυτό τον κατάλογο με βάση τις Λήψεις."
+
+#: cps/templates/index.xml:28
+msgid "Popular publications from this catalog based on Rating."
+msgstr "Δημοφιλείς εκδόσεις από αυτό τον κατάλογο με βάση την Αξιολόγηση."
+
+#: cps/templates/index.xml:31
+msgid "Recently added Books"
+msgstr "Βιβλία που προστέθηκαν Πρόσφατα"
+
+#: cps/templates/index.xml:35
+msgid "The latest Books"
+msgstr "Τα τελευταία Βιβλία"
+
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Τυχαία Βιβλία"
+
+#: cps/templates/index.xml:42
+msgid "Show Random Books"
+msgstr "Προβολή Τυχαίων Βιβλίων"
+
+#: cps/templates/index.xml:65
+msgid "Books ordered by Author"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά Συγγραφέα"
+
+#: cps/templates/index.xml:72
+msgid "Books ordered by publisher"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά εκδότη"
+
+#: cps/templates/index.xml:79
+msgid "Books ordered by category"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά κατηγορία"
+
+#: cps/templates/index.xml:86
+msgid "Books ordered by series"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά σειρές"
+
+#: cps/templates/index.xml:93
+msgid "Books ordered by Languages"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά Γλώσσες"
+
+#: cps/templates/index.xml:100
+msgid "Books ordered by Rating"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά Αξιολόγηση"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by file formats"
+msgstr "Τα βιβλία ταξινομήθηκαν ανά μορφές αρχείου"
+
+#: cps/templates/index.xml:111 cps/templates/layout.html:135
+msgid "Shelves"
+msgstr "Ράφια"
+
+#: cps/templates/index.xml:115
+msgid "Books organized in shelves"
+msgstr "Βιβλία οργανωμένα σε ράφια"
+
+#: cps/templates/layout.html:29
+msgid "Home"
+msgstr "Κεντρική"
+
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:168
+msgid "Back"
+msgstr "Πίσω"
+
+#: cps/templates/layout.html:35
+msgid "Toggle Navigation"
+msgstr "Αλλαγή Θέσης Περιήγησης"
+
+#: cps/templates/layout.html:46
+msgid "Search Library"
+msgstr "Αναζήτηση Βιβλιοθήκης"
+
+#: cps/templates/layout.html:77 cps/templates/read.html:71
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: cps/templates/layout.html:79
+msgid "Account"
+msgstr "Λογαριασμός"
+
+#: cps/templates/layout.html:81
+msgid "Logout"
+msgstr "Αποσύνδεση"
+
+#: cps/templates/layout.html:86 cps/templates/register.html:16
+msgid "Register"
+msgstr "Εγγραφή"
+
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
+msgid "Uploading..."
+msgstr "Φόρτωση..."
+
+#: cps/templates/layout.html:118
+msgid "Please do not refresh the page"
+msgstr "Παρακαλούμε μην ανανεώσεις τη σελίδα"
+
+#: cps/templates/layout.html:128
+msgid "Browse"
+msgstr "Περιήγηση"
+
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
+msgid "About"
+msgstr "Σχετικά"
+
+#: cps/templates/layout.html:155
+msgid "Previous"
+msgstr "Προηγούμενο"
+
+#: cps/templates/layout.html:182
+msgid "Book Details"
+msgstr "Λεπτομέρειες Βιβλίου"
+
+#: cps/templates/layout.html:215
+msgid "Upload done, processing, please wait..."
+msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
+
+#: cps/templates/layout.html:218
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: cps/templates/login.html:17
+msgid "Remember Me"
+msgstr "Να με Θυμάσαι"
+
+#: cps/templates/login.html:22
+msgid "Forgot Password?"
+msgstr "Ξέχασες τον Κωδικό;"
+
+#: cps/templates/login.html:25
+msgid "Log in with Magic Link"
+msgstr "Σύνδεση με το Μαγικό Σύνδεσμο"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web Log: "
+msgstr "Προβολή Φύλλου Καταγραφής Calibre-Web:"
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web Log: "
+msgstr "Calibre-Web Φύλλο Καταγραφής:"
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr "Η ροή απόδοσης, δεν μπορεί να εμφανιστεί"
+
+#: cps/templates/logviewer.html:12
+msgid "Show Access Log: "
+msgstr "Προβολή Φύλλου Καταγραφής Πρόσβασης:"
+
+#: cps/templates/modal_dialogs.html:6
+msgid "Select Allowed/Denied Tags"
+msgstr "Επιλογή Ετικετών Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:7
+msgid "Select Allowed/Denied Custom Column Values"
+msgstr "Επιλογή Τιμών Ειδικά Προσαρμοσμένης Στήλης Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:8
+msgid "Select Allowed/Denied Tags of User"
+msgstr "Επιλογή Ετικετών Χρήστη Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:9
+msgid "Select Allowed/Denied Custom Column Values of User"
+msgstr "Επιλογή Τιμών Χρήστη Ειδικά Προσαρμοσμένης Στήλης Επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/modal_dialogs.html:15
+msgid "Enter Tag"
+msgstr "Εισαγωγή Ετικέτας"
+
+#: cps/templates/modal_dialogs.html:24
+msgid "Add View Restriction"
+msgstr "Προσθήκη Περιορισμού Προβολής"
+
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Αυτή η μορφή βιβλίου θα διαγραφεί για πάντα από τη βάση δεδομένων"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Αυτό το βιβλίο θα διαγραφεί για πάντα από τη βάση δεδομένων"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "και σκληρός δίσκος"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Σημαντική Σημείωση Kobo: τα διαγραμμένα βιβλία θα παραμείνουν σε οποιαδήποτε συνδεδεμένη συσκευή Kobo."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Τα βιβλία πρέπει πρώτα να αρχειοθετηθούν και να συγχρονιστεί η συσκευή πριν μπορέσει να διαγραφεί με ασφάλεια το βιβλίο."
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr "Calibre-Web Κατάλογος eBook"
+
+#: cps/templates/read.html:74
+msgid "Reflow text when sidebars are open."
+msgstr "Επανάληψη ροής κειμένου όταν οι μπάρες στο πλάι είναι ανοιχτές."
+
+#: cps/templates/readcbr.html:93
+msgid "Keyboard Shortcuts"
+msgstr "Συντομεύσεις Πληκτρολογίου"
+
+#: cps/templates/readcbr.html:96
+msgid "Previous Page"
+msgstr "Προηγούμενη Σελίδα"
+
+#: cps/templates/readcbr.html:97
+msgid "Next Page"
+msgstr "Επόμενη Σελίδα"
+
+#: cps/templates/readcbr.html:98
+msgid "Scale to Best"
+msgstr "Κλιμάκωση στο Καλυτερο"
+
+#: cps/templates/readcbr.html:99
+msgid "Scale to Width"
+msgstr "Κλιμάκωση σε Πλάτος"
+
+#: cps/templates/readcbr.html:100
+msgid "Scale to Height"
+msgstr "Κλιμάκωση σε Ύψος"
+
+#: cps/templates/readcbr.html:101
+msgid "Scale to Native"
+msgstr "Κλιμάκωση σε Τοπικό"
+
+#: cps/templates/readcbr.html:102
+msgid "Rotate Right"
+msgstr "Περιστροφή Δεξιά"
+
+#: cps/templates/readcbr.html:103
+msgid "Rotate Left"
+msgstr "Περιστροφή Αριστερά"
+
+#: cps/templates/readcbr.html:104
+msgid "Flip Image"
+msgstr "Γύρισμα Σελίδας"
+
+#: cps/templates/readcbr.html:120
+msgid "Light"
+msgstr "Φωτεινό"
+
+#: cps/templates/readcbr.html:121
+msgid "Dark"
+msgstr "Σκοτεινό"
+
+#: cps/templates/readcbr.html:126
+msgid "Scale"
+msgstr "Κλίμακα"
+
+#: cps/templates/readcbr.html:129
+msgid "Best"
+msgstr "Καλύτερο"
+
+#: cps/templates/readcbr.html:130
+msgid "Width"
+msgstr "Πλάτος"
+
+#: cps/templates/readcbr.html:131
+msgid "Height"
+msgstr "Ύψος"
+
+#: cps/templates/readcbr.html:132
+msgid "Native"
+msgstr "Ντόπιο"
+
+#: cps/templates/readcbr.html:137
+msgid "Rotate"
+msgstr "Περιστροφή"
+
+#: cps/templates/readcbr.html:148
+msgid "Flip"
+msgstr "Γύρισμα"
+
+#: cps/templates/readcbr.html:151
+msgid "Horizontal"
+msgstr "Οριζόντιο"
+
+#: cps/templates/readcbr.html:152
+msgid "Vertical"
+msgstr "Κάθετο"
+
+#: cps/templates/readcbr.html:157
+msgid "Direction"
+msgstr "Κατεύθυνση"
+
+#: cps/templates/readcbr.html:160
+msgid "Left to Right"
+msgstr "Αριστερά προς Δεξιά"
+
+#: cps/templates/readcbr.html:161
+msgid "Right to Left"
+msgstr "Δεξιά προς Αριστερά"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF reader"
+msgstr "PDF πρόγραμμα ανάγνωσης"
+
+#: cps/templates/readtxt.html:6
+msgid "Basic txt Reader"
+msgstr "Βασικό Πρόγραμμα Ανάγνωσης txt"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "Εγγραφή Νέου Λογαριασμού"
+
+#: cps/templates/register.html:9
+msgid "Choose a username"
+msgstr "Επιλογή ενός ονόματος χρήστη"
+
+#: cps/templates/register.html:14
+msgid "Your email address"
+msgstr "Η διεύθυνση email σου"
+
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr "Μαγικός Σύνδεσμος - Εξουσιοδότηση Νέας Συσκευής"
+
+#: cps/templates/remote_login.html:6
+msgid "On another device, login and visit:"
+msgstr "Σε μια άλλη συσκευή, σύνδεση και επίσκεψη:"
+
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "Με την επαλήθευση, θα συνδεθείτε αυτόματα σε αυτή τη συσκευή."
+
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
+msgstr "Αυτός ο σύνδεσμος επαλήθευσης θα λήξει σε 10 λεπτά."
+
+#: cps/templates/search.html:5
+msgid "No Results Found"
+msgstr "Δεν Βρέθηκαν Αποτελέσματα"
+
+#: cps/templates/search.html:6
+msgid "Search Term:"
+msgstr "Όρος Αναζήτησης:"
+
+#: cps/templates/search.html:8
+msgid "Results for:"
+msgstr "Αποτελέσματα για:"
+
+#: cps/templates/search_form.html:20
+msgid "Published Date From"
+msgstr "Ημερομηνία Έκδοσης Από"
+
+#: cps/templates/search_form.html:27
+msgid "Published Date To"
+msgstr "Ημερομηνία Έκδοσης Μέχρι"
+
+#: cps/templates/search_form.html:44
+msgid "Exclude Tags"
+msgstr "Εξαίρεση Ετικετών"
+
+#: cps/templates/search_form.html:64
+msgid "Exclude Series"
+msgstr "Εξαίρεση Σειρών"
+
+#: cps/templates/search_form.html:85
+msgid "Exclude Languages"
+msgstr "Εξαίρεση Γλωσσών"
+
+#: cps/templates/search_form.html:96
+msgid "Extensions"
+msgstr "Επεκτάσεις"
+
+#: cps/templates/search_form.html:106
+msgid "Exclude Extensions"
+msgstr "Εξαίρεση Επεκτάσεων"
+
+#: cps/templates/search_form.html:118
+msgid "Rating Above"
+msgstr "Βαθμολογία Πάνω από"
+
+#: cps/templates/search_form.html:122
+msgid "Rating Below"
+msgstr "Βαθμολογία Κάτω από"
+
+#: cps/templates/shelf.html:10
+msgid "Delete this Shelf"
+msgstr "Διαγραφή αυτού του Ραφιού"
+
+#: cps/templates/shelf.html:11
+msgid "Edit Shelf"
+msgstr "Επεξεργασία Ραφιού"
+
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
+msgid "Change order"
+msgstr "Αλλαγή σειράς"
+
+#: cps/templates/shelf.html:75
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
+
+#: cps/templates/shelf.html:78
+msgid "Shelf will be deleted for all users"
+msgstr "Το ράφι θα διαγραφεί για όλους τουε χρήστες"
+
+#: cps/templates/shelf_edit.html:13
+msgid "Share with Everyone"
+msgstr "Κοινοποίηση με Όλους"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "Σύρε για Αναδιάταξη Σειράς"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Στατιστικά Βιβλιοθήκης"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "Βιβλία σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "Συγγραφείς σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "Κατηγορίες σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "Σειρές σε αυτή τη Βιβλιοθήκη"
+
+#: cps/templates/stats.html:29
+msgid "Linked Libraries"
+msgstr "Συνδεδεμένες Βιβλιοθήκες"
+
+#: cps/templates/stats.html:33
+msgid "Program Library"
+msgstr "Πρόγραμμα Βιβλιοθήκης"
+
+#: cps/templates/stats.html:34
+msgid "Installed Version"
+msgstr "Εγκατεστημένη Έκδοση"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "Χρήστης"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "Εργασία"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "Πρόοδος"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "Χρόνος Λειτουργίας"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "Ώρα Έναρξης"
+
+#: cps/templates/tasks.html:24
+msgid "Delete finished tasks"
+msgstr "Διαγραφή ολοκληρωμένων εργασιών"
+
+#: cps/templates/tasks.html:25
+msgid "Hide all tasks"
+msgstr "Απόκρυψη όλων των εργασιών"
+
+#: cps/templates/user_edit.html:19
+msgid "Reset user Password"
+msgstr "Επαναφορά Κωδικού χρήστη"
+
+#: cps/templates/user_edit.html:42
+msgid "Language of Books"
+msgstr "Γλώσσα Βιβλίων"
+
+#: cps/templates/user_edit.html:44
+msgid "Show All"
+msgstr "Προβολή Όλων"
+
+#: cps/templates/user_edit.html:53
+msgid "OAuth Settings"
+msgstr "OAuth Ρυθμίσεις"
+
+#: cps/templates/user_edit.html:55
+msgid "Link"
+msgstr "Σύνδεση"
+
+#: cps/templates/user_edit.html:57
+msgid "Unlink"
+msgstr "Αποσύνδεση"
+
+#: cps/templates/user_edit.html:63
+msgid "Kobo Sync Token"
+msgstr "Kobo Μονάδα Συγχρονισμού"
+
+#: cps/templates/user_edit.html:65
+msgid "Create/View"
+msgstr "Δημιουγία/Προβολή"
+
+#: cps/templates/user_edit.html:86
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "Προσθήκη Τιμών Ειδικά Προσαρμοσμένης Στήλης επιτρέπεται/Απορρίπτεται"
+
+#: cps/templates/user_edit.html:131
+msgid "Delete User"
+msgstr "Διαγραφή Χρήστη"
+
+#: cps/templates/user_edit.html:150
+msgid "Generate Kobo Auth URL"
+msgstr "Δημιουργία Kobo Auth URL"
+
+#: cps/templates/user_edit.html:166
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Θέλεις πραγματικά να διαγράψεις τη Μονάδα Kobo;"
+
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 2481dd40..162088b5 100644
Binary files a/cps/translations/es/LC_MESSAGES/messages.mo and b/cps/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 6012ed55..7d375d7e 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -49,9 +49,9 @@ msgstr "Reconexión correcta"
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Desconocido"
@@ -69,12 +69,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Denegar"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permitir"
 
@@ -124,7 +124,7 @@ msgstr "La ruta del Keyfile no es válida, por favor, introduzca la ruta correct
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de Certfile no es válida, por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -142,15 +142,15 @@ msgstr "La base de datos no es modificable"
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, completa todos los campos!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
@@ -176,121 +176,121 @@ msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 msgid "No admin user remaining, can't remove admin role"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Ocurrió un error desconocido."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Correo electrónico de prueba enviado con éxito a %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocurrió un error enviando el correo electrónico de prueba: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
@@ -302,103 +302,98 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "Formato de libro borrado correctamente"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr "Libro borrado correctamente"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Error abriendo un eBook. El archivo no existe o no es accesible"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión '%(ext)s' a este servidor"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Archivo con formato %(ext)s añadido a %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados correctamente"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Error al editar el libro, por favor, compruebe el archivo de registro (logfile) para tener más detalles"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "El archivo %(filename)s no pudo salvarse en el directorio temporal (Temp Dir)"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "El libro cargado probablemente existe en la biblioteca, considera cambiarlo antes de subirlo de nuevo: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Fallo al mover el archivo %(file)s: %(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Fallo al mover el archivo de cubierta %(file)s: %(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s a sido subido"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro puesto a la cola para su conversión a %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
@@ -411,175 +406,154 @@ msgstr "La configuración de Google Drive no se ha completado, intente desactiva
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "El dominio Callback no se ha verificado, siga los pasos para verificarlo en la consola de desarrollador de Google"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formato no encontrado para el id del libro: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s no encontrado en Google Drive: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Enviar al Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s no encontrado: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Enviar al Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Correo de prueba de Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Comprobar correo electrónico"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Primeros pasos con Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Correo electrónico de registro para el usuario: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Enviado %(format)s al Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Convertir %(orig)s a %(format)s y enviar al Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Correo electrónico: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "El archivo solicitado no puede ser leído. ¿Quizás existen problemas con los permisos?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Fallo al intentar borrar la carpeta del libro %(id)s, la ruta tiene subcarpetas: %(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "El borrado del libro %(id)s falló: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Borrando el libro %(id)s, la ruta del libro es inválida: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "El renombrado del título de: '%(src)s' a '%(dest)s' falló con el error: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "El renombrado del autor de: '%(src)s' a '%(dest)s' falló con el errore: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Ha fallado el cambio de nombre del archivo '%(src)s' a '%(dest)s' con el error: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Fichero %(file)s no encontrado en Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Error al descargar la cubierta"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Error en el formato de la cubierta"
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Error al crear una ruta para la cubierta"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "El archivo de cubierta no es una imágen válida"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Las cubiertas deben estar en formato jpg/jpeg/png/webp"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Siki kis archivos jpg/jpeg están soportados como cubierta"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "No se ha encontrado el binario del comando UnRar"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Error ejecutando UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Esperando"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Fallido"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Comenzado"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Finalizado"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Convertir: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Subir: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Tarea desconocida:"
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, accede a calibre-web desde una ubicación que no sea localhost para obtener una api_endpoint válida para tu dispositivo Kobo"
@@ -609,7 +583,7 @@ msgstr "Error al iniciar sesión con Google."
 msgid "Failed to fetch user info from Google."
 msgstr "Error al obtener información del usuario de Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -714,7 +688,7 @@ msgstr "Estante %(title)s creado"
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
@@ -745,388 +719,426 @@ msgstr "Libro oculto"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Añadido recientemente"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Mostrar libros recientes"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Libros populares"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Mostrar libros populares"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Libros leídos"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Mostrar no leído"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Descubrir"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Mostrar libros al azar"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Categorías"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Mostrar selección de categorías"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Series"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Mostrar selección de series"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Autores"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Editores"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Mostrar selección de editores"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Idiomas"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Mostrar selección de idiomas"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Calificaciones"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Mostrar selección de calificaciones"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Formatos de archivo"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "Libros archivados"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Dato inesperado mientras se leía la información de actualización"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Actualización no disponible. Ya tienes instalada la versión más reciente"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Una nueva actualización está disponible. Haz clic en el botón inferior para actualizar a la versión más reciente."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "No se puede conseguir información sobre la actualización"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo para actualizar a la versión: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Haz clic en el botón de abajo para actualizar a la última versión estable."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Al menos, un usuario LDAP no se ha encontrado en la base de datos"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "Usuario importado correctamente"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Libros añadidos recientemente"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Libros"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "oh, oh, el libro seleccionado no está disponible. El archivo no existe o no es accesible"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Lista de calificaciones"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Lista de formatos"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Tareas"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Buscar"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Publicado después de "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Publicado antes de "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Calificación <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Calificación >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "búsqueda"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Búsqueda avanzada"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Buscar"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Lista de calificaciones"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Lista de formatos"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Tareas"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Publicado después de "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Publicado antes de "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Calificación <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Calificación >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ha sucedido un error en el envío del libro: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor actualiza tu perfil con la dirección de correo de su kindle..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de E-Mail no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Se ha enviado un correo electrónico de verificación a su cuenta de correo."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Este nombre de usuario o correo electrónico ya están en uso."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login como: '%(nickname)s', no se puede acceder al servidor LDAP o usuario desconocido"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Una nueva contraseña se ha enviado a su cuenta de correo electrónico"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "iniciar sesión"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Token no encontrado"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "El token ha expirado"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Falló Ebook-converter: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Falló Ebook-converter: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Lista de usuarios"
@@ -1165,7 +1177,7 @@ msgstr "Subir archivo"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Descargar"
 
@@ -1178,8 +1190,9 @@ msgid "Edit"
 msgstr "Editar"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1324,16 +1337,16 @@ msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quieres reiniciar?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1353,20 +1366,19 @@ msgstr "via"
 msgid "In Library"
 msgstr "En la Librería"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Todo"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "reducir"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Más de"
 
@@ -1398,17 +1410,17 @@ msgstr "Convertir a:"
 msgid "Convert book"
 msgstr "Convertir libro"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Título del libro"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Descripción"
 
@@ -1416,15 +1428,15 @@ msgstr "Descripción"
 msgid "Identifiers"
 msgstr "Identificadores"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "Tipo de identificador"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "Valor de identificador"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "Borrar"
 
@@ -1432,7 +1444,7 @@ msgstr "Borrar"
 msgid "Add Identifier"
 msgstr "Añadir identificador"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -1456,9 +1468,9 @@ msgstr "Subir portada desde un disco local"
 msgid "Published Date"
 msgstr "Fecha de publicación"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Editor"
 
@@ -1467,11 +1479,11 @@ msgstr "Editor"
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Sí"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "No"
 
@@ -1483,7 +1495,7 @@ msgstr "Subir formato"
 msgid "View Book on Save"
 msgstr "Ver libro tras la edición"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
@@ -1493,60 +1505,133 @@ msgstr "Obtener metadatos"
 msgid "Save"
 msgstr "Guardar"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "¿Estás realmente seguro?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "El libro será eliminado de la base de datos de Calibre"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "y del disco duro"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Nota de Kobo importante:los libros borrados permanecerán en los dispositivos Kobo emparejados."
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Antes de que un libro pueda ser borrado con seguridad debe ser archivado y sincronixado con el dispositivo."
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Palabra clave"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Buscar por palabras clave "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Haz clic en la portada para cargar los metadatos en el formulario"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Cerrar"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Origen"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "¡No se encontraron resultados! Por favor intenta con otra palabra clave."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Título"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "¿Estás realmente seguro?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Configuración de la librería"
@@ -1836,10 +1921,6 @@ msgstr "Inicio de sesión"
 msgid "View Configuration"
 msgstr "Ver configuración"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Título"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Número de libros aleatorios a mostrar"
@@ -1848,7 +1929,7 @@ msgstr "Número de libros aleatorios a mostrar"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Número de autores para mostrar antes de ocultar (0 = desactivar la ocultación)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Tema"
 
@@ -1982,7 +2063,7 @@ msgstr "Agregar al estante"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Público)"
 
@@ -2034,7 +2115,7 @@ msgstr "Dominios prohibidos (Blaclist)"
 msgid "Are you sure you want to delete this domain?"
 msgstr "¿Realmente quiere eliminar esta regla de dominio?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2050,7 +2131,7 @@ msgstr "Abrir una incidencia"
 msgid "Return to Home"
 msgstr "Volver al inicio"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Grupo por serie"
 
@@ -2123,7 +2204,7 @@ msgid "Home"
 msgstr "Inicio"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Regresar"
 
@@ -2135,12 +2216,8 @@ msgstr "Alternar navegación"
 msgid "Search Library"
 msgstr "Buscar en la librería"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Búsqueda avanzada"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -2156,7 +2233,7 @@ msgstr "Cerrar sesión"
 msgid "Register"
 msgstr "Registro"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Cargando..."
 
@@ -2168,27 +2245,23 @@ msgstr "Por favor, no actualice la página"
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Sus estantes"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Detalles del libro"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Error"
 
@@ -2220,30 +2293,50 @@ msgstr "La salida del flujo no pudo ser mostrada"
 msgid "Show Access Log: "
 msgstr "Mostrar registro de acceso:"
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Seleccionar etiquetas Permitidas/Denegadas"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Seleccionar valores propios de columnas Permitidas/Denegadas"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Seleccionar etiquetas de usuario Permitido/Denegado"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Seleccionar columnas propias de usuario Permitido/Denegado"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Introduce la etiqueta"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Añadir restricción de vista"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "El libro será eliminado de la base de datos de Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "y del disco duro"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Nota de Kobo importante:los libros borrados permanecerán en los dispositivos Kobo emparejados."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Antes de que un libro pueda ser borrado con seguridad debe ser archivado y sincronixado con el dispositivo."
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Cátalogo de ebook de Calibre-Web"
@@ -2252,99 +2345,99 @@ msgstr "Cátalogo de ebook de Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Página previa"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Escalar a mejor"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Escalar a la ancho"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Escalar a lo alto"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Escalado nativo"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Rotar hacia la derecha"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Rotar hacia la izquierda"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Voltear imagen"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Oscuro"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Escalar"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Mejor"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Ancho"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Alto"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Nativo"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Rotar"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Voltear"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Dirección"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "De izquierda a derecha"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "De derecha a izquierda"
 
@@ -2396,39 +2489,39 @@ msgstr "Término de búsqueda:"
 msgid "Results for:"
 msgstr "Resultados para:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Fecha de publicación desde"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Fecha de publicación hasta"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Excluir etiquetas"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Excluir series"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Excluir idiomas"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Extensiones excluidas"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Clasificación mayor que"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Clasificación menor que"
 
@@ -2444,11 +2537,11 @@ msgstr "Editar estante"
 msgid "Change order"
 msgstr "Cambiar orden"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Realmente quiere eliminar este estante?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "El estante se borrará para todos los usuarios"
 
@@ -2564,15 +2657,11 @@ msgstr "Añadir columnas de valores propios de Permitidos/Denegados"
 msgid "Delete User"
 msgstr "Borrar usuario"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Descargas recientes"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Generar Auth URL de Kobo"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "¿Realmente quieres borrar el Token de Kobo?"
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index ac8b6077..5fcd5974 100644
Binary files a/cps/translations/fi/LC_MESSAGES/messages.mo and b/cps/translations/fi/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 6bd7a078..d9d537b5 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -66,12 +66,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -139,15 +139,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
@@ -173,121 +173,121 @@ msgstr "Pääkäyttäjiä ei jää jäljelle, käyttäjää ei voi poistaa"
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Tapahtui tuntematon virhe."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testisähköposti lähetetty onnistuneesti osoitteeseen %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Testisähköpostin lähetyksessä tapahtui virhe: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Päivitys valmistui, ole hyvä ja paina OK ja lataa sivu uudelleen"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -299,103 +299,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Virhe e-kirjaa avatessa. Tiedostoa ei löydy tai se ei ole saatavilla"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "muokkaa metadataa"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ei ole kelvollinen kieli"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Tiedostopääte '%(ext)s' ei ole sallittujen palvelimelle ladattavien listalla"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Kirjan editoinnissa tapahtui virhe, tarkista virheilmoitus lokista"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
@@ -408,175 +403,154 @@ msgstr "Google Drive asetukset ei ole valmiit. Koita poistaa Google Drive käyt
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Paluuosoitteen domain ei ole varmistettu, seuraa ohjeita vamistaaksesi sen googlen kehittäjäkonsolissa"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s tiedostomuotoa ei löytynyt kirjalle: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s ei löytynyt Google Drivesta: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Lähetä Kindleen"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Tämä sähköposti on lähetetty Calibre-Web:sta."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s ei löydy: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Lähetä Kindleen"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Tämä sähköposti on lähetetty Calibre-Web:sta."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web testisähköposti"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Testi sähköposti"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Aloita Calibre-Web:in käyttö"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rekiströintisähköposti käyttäjälle: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Lähetä %(format)s Kindleen"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Muunna %(orig)s muotoon %(format)s ja lähetä Kindleen"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Sähköposti: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Haettua tiedostoa ei pystytty lukemaan. Ehkä vaäärät oikeudet?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Tiedon muuttaminen arvosta: '%(src)s' arvoon '%(dest)s' epäonnistui virheeseen: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Kirjailijan muuttaminen arvosta: \"%(src)s\" arvoon \"%(dest)s\" epäonnistui virheeseen: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Tiedoston nimeäminen polusta '%(src)s' polkuun '%(dest)s' epäonnistui virheeseen: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Aloitettu"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Valmistui"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "Sähköposti: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Muunna: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Lähetä: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Tuntematon tehtävä: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
@@ -606,7 +580,7 @@ msgstr "Googleen kirjautuminen epäonnistui."
 msgid "Failed to fetch user info from Google."
 msgstr "Käyttäjätietojen haku Googlesta epäonnistui."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -711,7 +685,7 @@ msgstr "Hylly %(title)s luotu"
 msgid "There was an error"
 msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "luo hylly"
 
@@ -742,388 +716,426 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Viimeksi lisätty"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Näytä viimeisimmät kirjat"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Kuumat kirjat"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Näytä kuumat kirjat"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Näyt lukemattomat"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Löydä"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Näytä satunnaisia kirjoja"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Kategoriat"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Näytä kategoriavalinta"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Sarjat"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Näytä sarjavalinta"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Kirjailijat"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Julkaisijat"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Näytä julkaisijavalinta"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Kielet"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Näytä keilivalinta"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Arvostelut"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Näytä arvosteluvalinta"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Tiedotomuodot"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Odottamatonta tietoa luettaessa päivitystietoa"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Ei päivitystä saatavilla. Sinulla on jo uusin versio"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi uusimpaan versioon."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Päivitystiedon hakeminen epäonnistui"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Ei päivitystietoa saatavilla"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi versioon: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Paina alla olevaa nappia päivittääksesi uusimpaan vakaaseen versioon."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Viimeksi lisätyt kirjat"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Kirjat"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Virhe eKirjan avaamisessa. Tiedostoa ei ole tai se ei ole saatavilla:"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Arvostelulistaus"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Tiedostomuotolistaus"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Hae"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Julkaistu alkaen "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Julkaisut ennen "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Arvostelu <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Arvostelu >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "hae"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Edistynyt haku"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Hae"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Arvostelulistaus"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Tiedostomuotolistaus"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Julkaistu alkaen "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Julkaisut ennen "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Arvostelu <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Arvostelu >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Kirjan: %(res)s lähettämisessa tapahtui virhe"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "rekisteröidy"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Käyttäjätunnus tai sähköpostiosoite on jo käytössä."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "kirjaudu"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Valtuutusta ei löytynyt"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Valtuutus vanhentunut"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Lue kirja"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "E-kirjan muunnos epäonnistui: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "E-kirjan muunnos epäonnistui: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Käyttäjälista"
@@ -1162,7 +1174,7 @@ msgstr "Lähetä"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Lataa"
 
@@ -1175,8 +1187,9 @@ msgid "Edit"
 msgstr "Muokkaa"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Poista"
 
@@ -1321,16 +1334,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr ""
 
@@ -1350,20 +1363,19 @@ msgstr ""
 msgid "In Library"
 msgstr "Kirjastossa"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Kaikki"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "vähennä"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Enemmän"
 
@@ -1395,17 +1407,17 @@ msgstr "Muunna muotoon:"
 msgid "Convert book"
 msgstr "Muunna kirja"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Kirjan otsikko"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Kirjailija"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -1413,15 +1425,15 @@ msgstr "Kuvaus"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1429,7 +1441,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Tunnisteet"
 
@@ -1453,9 +1465,9 @@ msgstr "Lataa kuva paikalliselta levyltä"
 msgid "Published Date"
 msgstr "Julkaisupäivä"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Julkaisija"
 
@@ -1464,11 +1476,11 @@ msgstr "Julkaisija"
 msgid "Language"
 msgstr "Kieli"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Kyllä"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ei"
 
@@ -1480,7 +1492,7 @@ msgstr "Lataa tiedostomuoto"
 msgid "View Book on Save"
 msgstr "katso kirjaa muokkauksen jälkeen"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
@@ -1490,60 +1502,133 @@ msgstr "Hae metadata"
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Oletko aivan varma?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Kirja poistetaan Calibren tietokannasta"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "ja kiintolevyltä"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Avainsana"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Hae avainsanaa "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Sulje"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Lähde"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Hakuvirhe!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Ei osumia! Kokeile jotain tosita hakusanaa."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Otsikko"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Oletko aivan varma?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Kirjaston asetukset"
@@ -1833,10 +1918,6 @@ msgstr "Kirjaudu sisään"
 msgid "View Configuration"
 msgstr "Näytä konfiguraatio"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Otsikko"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Satunnaisten kirjojen näytön lukumäärä"
@@ -1845,7 +1926,7 @@ msgstr "Satunnaisten kirjojen näytön lukumäärä"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Kirjailijoiden lukumäärä ennen piilotusta (0=poista piilotus)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Teema"
 
@@ -1979,7 +2060,7 @@ msgstr "Lisää hyllyyn"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2031,7 +2112,7 @@ msgstr ""
 msgid "Are you sure you want to delete this domain?"
 msgstr "Haluatko todellakin poistaa tämän domainin säännön?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Seuraava"
 
@@ -2047,7 +2128,7 @@ msgstr "Luo virheilmoitus"
 msgid "Return to Home"
 msgstr "Palaa kotiin"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Ryhmitä sarjoittain"
 
@@ -2120,7 +2201,7 @@ msgid "Home"
 msgstr "Koti"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Palaa"
 
@@ -2132,12 +2213,8 @@ msgstr "Vaihda navigointi"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Edistynyt haku"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Asetukset"
 
@@ -2153,7 +2230,7 @@ msgstr "Kirjaudu ulos"
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Ladataan..."
 
@@ -2165,27 +2242,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Selaa"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Omat hyllysi"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tietoja"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Edellinen"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Virhe"
 
@@ -2217,30 +2290,50 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Kirja poistetaan Calibren tietokannasta"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "ja kiintolevyltä"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-kirjaluettelo"
@@ -2249,99 +2342,99 @@ msgstr "Calibre-Web e-kirjaluettelo"
 msgid "Reflow text when sidebars are open."
 msgstr "Uudelleenjärjestä teksti kun sivut on auki."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Näppäimistöpikakomennot"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Edellinen sivu"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Seuraava sivu"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Skaalaa parhaaseen"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Skaalaa leveyteen"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Skaalaa korkeuteen"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Skaalaa alkuperäiseen"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Käännä oikealle"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Käännä vasemmalle"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Käännä kuva"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Vaalea"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Tumma"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Skaalaa"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Paras"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Leveys"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Korkeus"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Alkuperäinen"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Pyöritä"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Käännä"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Vaakasuunta"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Pystysuunta"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Suunta"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Vasemmalta oikealle"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Oikealta vasemmalle"
 
@@ -2393,39 +2486,39 @@ msgstr ""
 msgid "Results for:"
 msgstr "Tulosket haulle:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Julkaisupäivästä"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Julkaisupäivään"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Poissulje merkintä"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Poissulje sarja"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Poissulje kieli"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Arvio enemmän kun"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Arvio vähemmän kun"
 
@@ -2441,11 +2534,11 @@ msgstr "Muuta hyllyä"
 msgid "Change order"
 msgstr "Muuta järjestystä"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Hylly poistetaan kaikilta ja ikuisesti!"
 
@@ -2561,15 +2654,11 @@ msgstr ""
 msgid "Delete User"
 msgstr "Poista tämä käyttäjä"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Viimeisimmät lataukset"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 3a1a59c1..327cb152 100644
Binary files a/cps/translations/fr/LC_MESSAGES/messages.mo and b/cps/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index f617850d..ec4e682d 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: Dekani <dekani1500@gmail.com>\n"
 "Language: fr\n"
@@ -60,9 +60,9 @@ msgstr "Reconnecté avec succès"
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Inconnu"
@@ -80,12 +80,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Refuser"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Autoriser"
 
@@ -135,7 +135,7 @@ msgstr "L'emplacement du fichier Keyfile est incorrect, veuillez saisir un chemi
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Certfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -153,15 +153,15 @@ msgstr "La DB n'est pas accessible en écriture"
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
@@ -187,121 +187,121 @@ msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer le rôle admin"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Courriel de test envoyé avec succès sur %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Il y a eu une erreur pendant l’envoi du courriel de test : %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Mise à jour terminée, merci d’appuyer sur okay et de rafraîchir la page"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
@@ -313,103 +313,98 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "Le format du livre a été supprimé avec succès"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Erreur à l’ouverture du livre. Le fichier n’existe pas ou n’est pas accessible"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "L’extension de fichier '%(ext)s' n’est pas autorisée pour être déposée sur ce serveur"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossible de créer le chemin %(path)s (Permission refusée)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Le format de fichier %(ext)s a été ajouté à %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Erreur d’édition du livre, veuillez consulter le journal (log) pour plus de détails"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Le fichier %(filename)s ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Le fichier téléchargé existe probablement dans la librairie, veuillez le modifier avant de le télécharger de nouveau: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Impossible de déplacer le fichier %(file)s: %(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Impossible de déplacer le fichier de couverture %(file)s: %(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Le format de conversion de la source ou de la destination est manquant"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Le livre a été mis avec succès en file de traitement pour conversion vers %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Une erreur est survenue au cours de la conversion du livre : %(res)s"
@@ -422,175 +417,154 @@ msgstr "La configuration de Google Drive n’est pas terminée, essayez de désa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "le format %(format)s est introuvable pour le livre : %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "le %(format)s est introuvable sur Google Drive : %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Envoyer vers Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ce courriel a été envoyé depuis Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s introuvable : %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Envoyer vers Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Ce courriel a été envoyé depuis Calibre-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Courriel de test de Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Courriel de test"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Bien démarrer avec Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Envoyer %(format)s vers le Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Courriel : %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Le fichier demandé n’a pu être lu. Problème de permission d’accès ?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "La suppression du livre %(id)s a échoué: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Suppression du livre %(id)s, le chemin du livre est invalide : %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renommer le titre de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Renommer l’auteur de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modification du nom de fichier du chemin : '%(src)s' vers '%(dest)s' a échoué avec l’erreur : %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Le fichier %(file)s n'a pas été trouvé dans Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Le chemin du livre %(path)s n'a pas été trouvé dans Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Erreur lors du téléchargement de la couverture"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Erreur de format de couverture"
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Impossible de créer le chemin pour la couverture"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Le fichier couverture n'est pas un fichier image valide, ou ne peut pas être stocké"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg/png/webp sont supportés comme fichier de couverture"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg sont supportés comme fichier de couverture"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "En attente"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Echoué"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Débuté"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Terminé"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "Courriel : "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Convertir vers : "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Téléverser : "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Tâche inconnue : "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Veuilllez ne pas accéder à calibre-web par localhost pour obtenir un api_endpoint valide pour un appareil kobo"
@@ -620,7 +594,7 @@ msgstr "Échec de la connexion avec Google."
 msgid "Failed to fetch user info from Google."
 msgstr "Impossible d’obtenir les informations d’utilisateur avec Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -725,7 +699,7 @@ msgstr "Étagère %(title)s créée"
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
@@ -756,388 +730,426 @@ msgstr "Livre caché"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Ajouts récents"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Afficher les livres récents"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Livres populaires"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Montrer les livres populaires"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Livres lus"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Afficher non-lus"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Découvrir"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Catégories"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Montrer la sélection par catégories"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Séries"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Montrer la sélection par séries"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Éditeurs"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Montrer la sélection par éditeur"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Langues"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Montrer la sélection par langue"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Notes"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Afficher la sélection des évaluations"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Formats de fichier"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "Livres archivés"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Données inattendues lors de la lecture des informations de mise à jour"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Aucune mise à jour disponible. Vous avez déjà la dernière version installée"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-dessous pour charger la dernière version."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Impossible d'extraire les informations de mise à jour"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-dessous pour charger la version: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Téléchargez la dernière version en cliquant sur le bouton ci-dessous."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erreur : Aucun utilisateur renvoyé dans la réponse LDAP du serveur"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Au moins un utilisateur LDAP n'a pas été trouvé dans la base de données"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "L'utilisateur a été importé avec succès"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Ajouts récents de livres"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Livres"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est pas accessible"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Liste des évaluations"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Liste de formats de fichiers"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Tâches"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Chercher"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Publié après le "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Publié avant le "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Évaluation <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Évaluation >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "recherche"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Recherche avancée"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Chercher"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Liste des évaluations"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Liste de formats de fichiers"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Tâches"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Publié après le "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Publié avant le "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Évaluation <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Évaluation >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Veuillez mettre à jour votre profil avec une adresse de courriel Kindle valide."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Le serveur de courriel n'est pas configuré, veuillez contacter votre administrateur!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Ce nom d’utilisateur ou cette adresse de courriel sont déjà utilisés."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Connexion de secours comme: '%(nickname)s', le serveur LDAP est indisponible, ou l'utilisateur est inconnu"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Le nouveau mot de passe a été envoyé vers votre adresse de courriel"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "connexion"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "ebook-convert calibre %(tool)s non trouvé"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "La commande ebook-convert a échouée : %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "La commande Kepubify-converter a échouée : %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Fichier converti non trouvé ou plus d'un fichier dans le chemin %(folder)s"
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "La commande ebook-convert a échouée : %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Liste des utilisateurs"
@@ -1176,7 +1188,7 @@ msgstr "Téléverser"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Télécharger"
 
@@ -1189,8 +1201,9 @@ msgid "Edit"
 msgstr "Éditer"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1335,16 +1348,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1364,20 +1377,19 @@ msgstr "via"
 msgid "In Library"
 msgstr "Dans la librairie"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Tout"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "réduire"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Plus de"
 
@@ -1409,17 +1421,17 @@ msgstr "Convertir vers :"
 msgid "Convert book"
 msgstr "Convertir le livre"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Description"
 
@@ -1427,15 +1439,15 @@ msgstr "Description"
 msgid "Identifiers"
 msgstr "Identifiants"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "Type d'identifiant"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "Valeur d'identifiant"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1443,7 +1455,7 @@ msgstr "Supprimer"
 msgid "Add Identifier"
 msgstr "Ajouter un identifiant"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Étiquettes"
 
@@ -1467,9 +1479,9 @@ msgstr "Téléverser la couverture depuis un fichier en local"
 msgid "Published Date"
 msgstr "Date de publication"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Éditeur"
 
@@ -1478,11 +1490,11 @@ msgstr "Éditeur"
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Oui"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Non"
 
@@ -1494,7 +1506,7 @@ msgstr "Format du fichier téléversé"
 msgid "View Book on Save"
 msgstr "Voir le livre lors de la sauvegarde"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Obtenir les métadonnées"
 
@@ -1504,60 +1516,133 @@ msgstr "Obtenir les métadonnées"
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Êtes-vous vraiment sûr?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Le livre va être supprimé définitivement de la base de données"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "et du disque dur"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Note Kobo importante: les livres supprimés vont rester sur l'appareil Kobo appairé."
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Les livres doivent d'abord être archivés et l'appareil synchronisé avant qu'un livre puisse être supprimé en tout sécurité."
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Cliquer sur la couverture pour importer les métadonnées dans le formulaire"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Fermer"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Source"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Erreur lors de la recherche!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Aucun résultat. Veuillez essayer avec un nouveau mot clé."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titre"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Êtes-vous vraiment sûr?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Configuration de la Bibliothèque"
@@ -1847,10 +1932,6 @@ msgstr "Connexion"
 msgid "View Configuration"
 msgstr "Configuration du mode d’affichage"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titre"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Nombre de livres choisis au hasard à afficher"
@@ -1859,7 +1940,7 @@ msgstr "Nombre de livres choisis au hasard à afficher"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Nombre d’auteurs à afficher avant de masquer (0=désactiver le masquage)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Thème"
 
@@ -1993,7 +2074,7 @@ msgstr "Ajouter à l'étagère"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Public)"
 
@@ -2045,7 +2126,7 @@ msgstr "Domaines refusés (Liste noire)"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Souhaitez-vous vraiment supprimer cette règle de domaine ?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Suivant"
 
@@ -2061,7 +2142,7 @@ msgstr "Signaler un problème"
 msgid "Return to Home"
 msgstr "Retour à l’accueil"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Grouper par séries"
 
@@ -2134,7 +2215,7 @@ msgid "Home"
 msgstr "Accueil"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Retour"
 
@@ -2146,12 +2227,8 @@ msgstr "Basculer la navigation"
 msgid "Search Library"
 msgstr "Chercher dans librairie"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Recherche avancée"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -2167,7 +2244,7 @@ msgstr "Déconnexion"
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Téléversement en cours..."
 
@@ -2179,27 +2256,23 @@ msgstr "Veuillez ne pas rafraîchir la page"
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Vos étagères"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Détails du livre"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Erreur"
 
@@ -2231,30 +2304,50 @@ msgstr "Le flux de sortie ne peut pas être affiché"
 msgid "Show Access Log: "
 msgstr "Afficher le journal d'accès : "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Sélectionner les étiquettes autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Sélectionner les colonnes personnalisées autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Sélectionner les étiquettes d'utilisateur autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Sélectionner les colonnes personnalisées d'utilisateur autorisées/refusées"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Saisir une étiquette"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Ajouter une restriction de visualisation"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Le livre va être supprimé définitivement de la base de données"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "et du disque dur"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Note Kobo importante: les livres supprimés vont rester sur l'appareil Kobo appairé."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Les livres doivent d'abord être archivés et l'appareil synchronisé avant qu'un livre puisse être supprimé en tout sécurité."
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Catalogue de livres électroniques Calibre-Web"
@@ -2263,99 +2356,99 @@ msgstr "Catalogue de livres électroniques Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Mettre à jour la mise en page du texte quand les bandeaux latéraux sont ouverts."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Mise à l’échelle optimale"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Mise à l’échelle sur la largeur"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Mise à l’échelle sur la hauteur"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Mise à l’échelle d’origine"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Rotation droite"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Rotation gauche"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Inverser l’image"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Clair"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Sombre"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Échelle"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Optimal"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Largeur"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Hauteur"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Origine"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Rotation"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Inverser"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Direction"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "De gauche à droite"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "De droite à gauche"
 
@@ -2407,39 +2500,39 @@ msgstr "Chercher le terme:"
 msgid "Results for:"
 msgstr "Résultats pour :"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Date de publication (depuis)"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Date de publication (jusqu’à)"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Exclure les étiquettes"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Exclure les séries"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Exclure les langues"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Extensions"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Exclure les extensions"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Évaluation supérieure à"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Évaluation inférieure à"
 
@@ -2455,11 +2548,11 @@ msgstr "Modifier l’étagère"
 msgid "Change order"
 msgstr "Modifier l’ordre"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "L’étagère sera supprimée pour tous les utilisateus"
 
@@ -2575,15 +2668,11 @@ msgstr "Ajouter les valeurs de colonnes personnalisées autorisées/refusées"
 msgid "Delete User"
 msgstr "Supprimer l'utilisateur"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Téléchargements récents"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Générer l'URL d'authentification Kobo"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Voulez-vous vraiment supprimer le jeton Kobo?"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 4b4682b8..ac64c6a7 100644
Binary files a/cps/translations/hu/LC_MESSAGES/messages.mo and b/cps/translations/hu/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 7e0257ac..a93f9c44 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -66,12 +66,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -139,15 +139,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
@@ -173,121 +173,121 @@ msgstr ""
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Ismeretlen hiba történt."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "A teszt levél sikeresen elküldve ide: %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Hiba történt a teszt levél küldése során: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "A frissítés települt, kattints az OK-ra és újra tölt az oldal"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -299,103 +299,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Hiba az ekönyv megnyitásakor. A fájl nem létezik vagy nem elérhető."
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "A(z) \"%(ext)s\" kiterjesztésű fájlok feltöltése nincs engedélyezve ezen a szerveren."
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nem sikerült létrehozni az elérési utat (engedély megtagadva): %(path)s."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "A(z) %(ext)s fájlformátum hozzáadva a könyvhez: %(book)s."
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Hiba a könyv szerkesztése során, további részletek a naplófájlban."
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Az átalakításhoz hiányzik a forrás- vagy a célformátum!"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "A könyv sikeresen átalakításra lett jelölve a következő formátumra: %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Hiba történt a könyv átalakításakor: %(res)s"
@@ -408,175 +403,154 @@ msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "A visszahívási tartomány nem ellenőrzött, kövesd az alábbi lépéseket a tartomány ellenőrzéséhez a Google Developer Console-ban:"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "A(z) %(format)s formátum nem található a következő könyvhöz: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s nem található a Google Drive-on: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Küldés Kindle-re"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nem található: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Küldés Kindle-re"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web teszt e-mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Teszt e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Kezdő lépések a Calibre-Web-bel"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Regisztrációs e-mail a következő felhasználóhoz: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s küldése Kindle-re"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "A kért fájl nem olvasható. Esetleg jogosultsági probléma lenne?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "A cím átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "A szerző átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "\"%(src)s\" fájl átnevezése \"%(dest)s\"-re nem sikerült a következő hiba miatt: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "A könyv elérési útja (\"%(path)s\") nem található a Google Drive-on"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Nem sikerült"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Elindítva"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Végrehajtva"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail cím: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konvertálás:"
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Feltöltés:"
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Ismeretlen feladat:"
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
@@ -606,7 +580,7 @@ msgstr ""
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -711,7 +685,7 @@ msgstr "A következő polc létre lett hozva: %(title)s"
 msgid "There was an error"
 msgstr "Hiba történt"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
@@ -742,388 +716,426 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Legutóbb hozzáadott"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Legutóbbi könyvek mutatása"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Kelendő könyvek"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Kelendő könyvek mutatása"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr ""
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Felfedezés"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Könyvek találomra mutatása"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Címkék"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Címke választó mutatása"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Sorozatok"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Sorozat választó mutatása"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Szerzők"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Kiadók"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Kiadó választó mutatása"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Nyelvek"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Nyelv választó mutatása"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr ""
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr ""
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Ismeretlen adat a frissítési információk olvasásakor"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Nem érhető el újabb frissítés. Már a legújabb verzió van telepítve."
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Egy új frissítés érhető el. Kattints a lenti gombra a legújabb verzió frissítésére"
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Nem lehetett begyűjteni a frissítési információkat"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez a következő verzióra: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Legutóbb hozzáadott könyvek"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Hiba történt az e-könyv megnyitásakor. A fájl nem létezik vagy nem érhető el:"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Feladatok"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Keresés"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Kiadva ezután: "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Kiadva ezelőtt: "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Értékelés <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Értékelés <= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "keresés"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Részletes keresés"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Keresés"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Kiadva ezután: "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Kiadva ezelőtt: "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Értékelés <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Értékelés <= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Hiba történt a könyv küldésekor: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Először be kell állítani a kindle e-mail címet..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "regisztrálás"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Jóváhagyó levél elküldve az email címedre."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Ez a felhasználónév vagy e-mail cím már használatban van."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "belépés"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "A token nem található."
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "A token érvényessége lejárt."
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Egy olvasott könyv"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Az e-könyv átalakítás nem sikerült: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Az e-könyv átalakítás nem sikerült: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Felhasználók listája"
@@ -1162,7 +1174,7 @@ msgstr "Feltöltés"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Letöltés"
 
@@ -1175,8 +1187,9 @@ msgid "Edit"
 msgstr "Szerkesztés"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Törlés"
 
@@ -1321,16 +1334,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr ""
 
@@ -1350,20 +1363,19 @@ msgstr "keresztül"
 msgid "In Library"
 msgstr "Könyvtárban"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr ""
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "csökkentsd"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Több eszerint:"
 
@@ -1395,17 +1407,17 @@ msgstr "Konvertálás erre:"
 msgid "Convert book"
 msgstr "Könyv konvertálása"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Könyv címe"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Szerző"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Leírás"
 
@@ -1413,15 +1425,15 @@ msgstr "Leírás"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1429,7 +1441,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Címkék"
 
@@ -1453,9 +1465,9 @@ msgstr "Borító feltöltése helyi meghajtóról"
 msgid "Published Date"
 msgstr "Kiadás éve"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Kiadó"
 
@@ -1464,11 +1476,11 @@ msgstr "Kiadó"
 msgid "Language"
 msgstr "Nyelv"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Igen"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nem"
 
@@ -1480,7 +1492,7 @@ msgstr "Feltöltés formátuma"
 msgid "View Book on Save"
 msgstr "Könyv megnézése szerkesztés után"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
@@ -1490,60 +1502,133 @@ msgstr "Metaadatok beszerzése"
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Biztosan?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "A könyv törölve lesz a Calibre adatbázisból"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr " és a merevlemezről"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Kulcsszó"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Keresési kulcsszó "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Kattints a borítóra a metadatok betöltésére"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Bezárás"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Forrás"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Keresési hiba!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nincs találat! Próbálj másik kulcsszót."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Név"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Biztosan?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Könyvát beállításai"
@@ -1833,10 +1918,6 @@ msgstr "Belépés"
 msgid "View Configuration"
 msgstr "Általános beállítások"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Név"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Találomra mutatott könyvek száma"
@@ -1845,7 +1926,7 @@ msgstr "Találomra mutatott könyvek száma"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Mutatott szerzők száma (0=elrejtés kikapcsolása)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Téma"
 
@@ -1979,7 +2060,7 @@ msgstr "Hozzáadás polchoz"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2031,7 +2112,7 @@ msgstr ""
 msgid "Are you sure you want to delete this domain?"
 msgstr "Valóban törölni akarod ezt a tartomány-szabályt?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Következő"
 
@@ -2047,7 +2128,7 @@ msgstr ""
 msgid "Return to Home"
 msgstr "Vissza a kezdőlapra"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr ""
 
@@ -2120,7 +2201,7 @@ msgid "Home"
 msgstr "Kezdőlap"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Vissza"
 
@@ -2132,12 +2213,8 @@ msgstr "Navigáció átkapcsolása"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Részletes keresés"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -2153,7 +2230,7 @@ msgstr "Kilépés"
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -2165,27 +2242,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Saját polcok"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Könyv részletei"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Hiba"
 
@@ -2217,30 +2290,50 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "A könyv törölve lesz a Calibre adatbázisból"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr " és a merevlemezről"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-könyv katalógus"
@@ -2249,99 +2342,99 @@ msgstr "Calibre-Web e-könyv katalógus"
 msgid "Reflow text when sidebars are open."
 msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Előző oldal"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Következő oldal"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Méretezés a legjobbra"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Méretezés a szélességre"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Méretezés a magasságra"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Méretezés a natívra"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Forgatás balra"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Forgatás jobbra"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Kép tükrözése"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Világos"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Sötét"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Méretezés"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Legjobb"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Szélesség"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Magasság"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Natív"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Forgatás"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Tökrözés"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr ""
 
@@ -2393,39 +2486,39 @@ msgstr ""
 msgid "Results for:"
 msgstr "Találatok a következőhöz:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Kiadás éve ettől: "
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Kiadás éve eddig: "
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Cimkék kizárása"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Sorozatok kizárása"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Nyelvek kizárása"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Értékelés nagyob mint"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Értékelés kisebb mint"
 
@@ -2441,11 +2534,11 @@ msgstr "Polc szerkesztése"
 msgid "Change order"
 msgstr "Sorrend változtatása"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "A polc el fog tűnni mindenki számára és örökké!"
 
@@ -2561,15 +2654,11 @@ msgstr ""
 msgid "Delete User"
 msgstr "A felhasználó törlése"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Utolsó letöltések"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 84293bff..8d4227a2 100644
Binary files a/cps/translations/it/LC_MESSAGES/messages.mo and b/cps/translations/it/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 7a49e937..a8a35372 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -45,9 +45,9 @@ msgstr "Ricollegato con successo"
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -65,12 +65,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Nega"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permetti"
 
@@ -120,7 +120,7 @@ msgstr "La posizione del Keyfile non è valida, per favore indica il percorso co
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Certfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -138,15 +138,15 @@ msgstr "Il DB non è scrivibile"
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
@@ -172,121 +172,121 @@ msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utent
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di amministratore"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Ho trovato un account creato in precedenza con questo e-mail."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utente '%(nick)s' aggiornato"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Si è verificato un errore imprevisto."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni SMTP"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "E-mail di test inviato con successo a %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Si è verificato un errore nell'invio dell'e-mail di test: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
@@ -298,103 +298,98 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "Il formato del libro è stato eliminato con successo"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Errore durante l'apertura del libro. Il file non esiste o il file non è accessibile"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "Modifica i metadati"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Non è consentito caricare file con l'estensione '%(ext)s' su questo server"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Ho aggiunto il formato %(ext)s al libro %(book)s"
 
-#: cps/editbooks.py:636
-msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
-msgstr ""
-
 #: cps/editbooks.py:673
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "Gli identificatori non tengono conto delle lettere maiuscole o minuscole, sovrascrivo l'identificatore precedente"
+
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Errore nella modifica del libro. Per favore verifica i dettagli nel file di registro (logfile)"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Il file %(filename)s non può essere salvato nella cartella temporanea"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Impossibile spostare il file %(file)s: %(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Impossibile spostare il file della copertina %(file)s: %(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Mancano o il formato sorgente o quello di destinazione, entrambi necessari alla conversione"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro accodato con successo per essere convertito in %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
@@ -407,175 +402,154 @@ msgstr "La configurazione di Google Drive non è stata completata correttamente.
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain non è stato verificato. Per favore intraprendi il necessario per verificare il dominio nella developer console di Google"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s non trovato per il libro: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s non trovato su Google Drive: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Invia a Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s non trovato: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Invia a Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "E-mail di test da Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "E-mail di test"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Inizia con Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail di registrazione dell'utente: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Invia %(format)s a Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Converti %(orig)s in %(format)s e spedisci a Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Il file richiesto non può essere letto. I permessi sono corretti?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "L'eliminazione della cartella del libro %(id)s non è riuscita, il percorso ha sottocartelle: %(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "L'eliminazione del libro %(id)s non è riuscita: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Eliminazione del libro %(id)s. Il percorso del libro non è valido: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modifica del titolo da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "La modifica dell'autore da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modifica del file nella cartella da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "File %(file)s non trovato su Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Non ho trovato la cartella %(path)s del libro su Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Errore nello scaricare la copertina"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Errore di formato della copertina"
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Errore nel creare la cartella per la copertina"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Il file della copertina non è in un formato immagine valido o non può essere salvato"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg/png/webp sono supportati per le copertine"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg sono supportati per le copertine"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Attendi"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Avviato"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Terminato"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Conversione: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Upload: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Processo sconosciuto: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Per favore, per ottenere un valido api-endpoint per Kobo, accedi a Calibre-web non da localhost"
@@ -605,7 +579,7 @@ msgstr "L'accesso con Google non è riuscito."
 msgid "Failed to fetch user info from Google."
 msgstr "Il recupero delle informazioni dell'utente da Google non è riuscito."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -710,7 +684,7 @@ msgstr "Lo scaffale %(title)s è stato creato"
 msgid "There was an error"
 msgstr "C'era un errore"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
@@ -741,387 +715,425 @@ msgstr "Libro nascosto"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Aggiunti recentemente"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Mostra l'opzione per la selezione dei libri più recenti"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Libri popolari"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Mostra l'opzione per la selezione dei libri più popolari"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr "Libri scaricati"
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Libri da leggere"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Libri non letti"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Mostra l'opzione per la selezione dei libri non letti"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Per scoprire"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Mostra l'opzione per presentare libri aleatoriamente"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Categorie"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Mostra l'opzione per la selezione delle categorie"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Serie"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Mostra l'opzione per la selezione delle serie"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Autori"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Editori"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Mostra l'opzione per la selezione degli editori"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Lingue"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Mostra l'opzione per la selezione delle lingue"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Valutazioni"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Mostra l'opzione per la selezione della valutazione"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Formati file"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Mostra la selezione del formato dei file"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr "Elenco libri"
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr "Mostra l'opzione per visualizzare i libri sottoforma di elenco"
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Dati inattesi durante il processo di aggiornamento"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Nessun aggiornamento disponibile. Hai già installato l'ultima versione"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per aggiornare all'ultima versione."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Impossibile recuperare le informazioni di aggiornamento"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per aggiornare alla versione: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "Utente importato con successo"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Libri aggiunti di recente"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Libri"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "Libri scaricati da %(user)s"
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Errore durante l'apertura del libro selezionato. Il file non esiste o il file non è accessibile"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Elenco delle valutazioni"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Elenco dei formati"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Compito"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Cerca"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Pubblicato dopo "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Pubblicato prima "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Valutazione <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Valutazione >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "ricerca"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonna personale no.%(column)d non esiste nel database di Calibre"
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Ricerca avanzata"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Cerca"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr "Elenco dei libri"
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Elenco delle valutazioni"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Elenco dei formati"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Compito"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Pubblicato dopo "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Pubblicato prima "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Valutazione <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Valutazione >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Libro accodato con successo per essere spedito a %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Per favore aggiorna il tuo profilo con un indirizzo e-mail Kindle a cui inviare i libri."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "registra"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un e-mail di conferma è stato inviato al tuo indirizzo."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Questo nome di utente o questo e-mail sono già utilizzati."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "accedi"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Leggi un libro"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Non ho trovato il convertitore %(tool)s di libri di Calibre"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Errore nel convertitore: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr "Non ho trovato il formato %(format)s nel disco"
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr "La conversione del libro è terminata con un errore sconosciuto"
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Si è verificato un errore con il convertitore Kepubify: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
-msgstr "Non ho trovato il file convertito o più di un file nella cartella %(folder)s"
+msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartella %(folder)s"
+
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Errore nel convertitore: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Si è verificato un errore con Calibre: %(error)s"
 
 #: cps/templates/admin.html:9
 msgid "Users"
@@ -1161,7 +1173,7 @@ msgstr "Upload"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Download"
 
@@ -1174,8 +1186,9 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1320,16 +1333,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1349,20 +1362,19 @@ msgstr "via"
 msgid "In Library"
 msgstr "Nella libreria"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Tutti"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "riduci"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Altro da"
 
@@ -1394,17 +1406,17 @@ msgstr "Converti in:"
 msgid "Convert book"
 msgstr "Converti libro"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Titolo del libro"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autore"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1412,15 +1424,15 @@ msgstr "Descrizione"
 msgid "Identifiers"
 msgstr "Identificatori"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "Tipo di identificatore"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "Valore dell'identificatore"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1428,7 +1440,7 @@ msgstr "Rimuovi"
 msgid "Add Identifier"
 msgstr "Aggiungi un identificatore"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Categorie"
 
@@ -1452,9 +1464,9 @@ msgstr "Carica la copertina dal disco locale"
 msgid "Published Date"
 msgstr "Data di pubblicazione"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Editore"
 
@@ -1463,11 +1475,11 @@ msgstr "Editore"
 msgid "Language"
 msgstr "Lingua"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Sì"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "No"
 
@@ -1479,7 +1491,7 @@ msgstr "Carica formato"
 msgid "View Book on Save"
 msgstr "visualizza il libro dopo la modifica"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
@@ -1489,60 +1501,133 @@ msgstr "Ottieni metadati"
 msgid "Save"
 msgstr "Salva"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Sei davvero sicuro?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Il libro verrà cancellato dal database di Calibre"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "e dal disco rigido"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Oservazione importante riguardo Kobo: i libri eliminati, rimarranno in ogni lettore Kobo accoppiato."
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Prima di poter eliminare in sicurezza un libro, occorre che il libro venga archiviato e che l'apparecchio venga sincronizzato."
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " ricerca parola chiave "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Fai clic sulla copertina per caricare i metadati presenti nel modulo"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Chiudi"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Errore di ricerca!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nessun risultato! Prova con un altro criterio di ricerca."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "Questo campo è obbligatorio"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "Unisci i libri selezionati"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "Rimuovi le selezioni"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "Aggiorna l'ordinamento dei titoli automaticamente"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "Aggiorna l'ordinamento degli autori automaticamente"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "Indica il titolo"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titolo"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr "Indica l'ordinamento del titolo"
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr "Ordinamento del titolo"
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr "Indica l'ordinamento dell'autore"
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr "Ordinamento dell'autore"
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr "Indica gli autori"
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr "Indica le categorie"
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr "Indica le serie"
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr "Indica il titolo"
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr "Indice delle serie"
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr "Indica le lingue"
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr "Data di pubblicazione"
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr "Indica gli editori"
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Sei davvero sicuro?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr "I libri con il titolo vengono uniti da:"
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr "Nel libro con il titolo:"
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "Unisci"
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Configurazione della libreria"
@@ -1553,7 +1638,7 @@ msgstr "Posizione del database di Calibre"
 
 #: cps/templates/config_edit.html:28
 msgid "Use Google Drive?"
-msgstr "Utilizzo Google Drive?"
+msgstr "Utilizza Google Drive"
 
 #: cps/templates/config_edit.html:34
 msgid "Google Drive config problem"
@@ -1633,7 +1718,7 @@ msgstr "Ulteriori opzioni"
 
 #: cps/templates/config_edit.html:165
 msgid "Enable Uploads"
-msgstr "Abilita il caricamento"
+msgstr "Abilita l'upload /il caricamento"
 
 #: cps/templates/config_edit.html:169
 msgid "Allowed Upload Fileformats"
@@ -1832,10 +1917,6 @@ msgstr "Accesso"
 msgid "View Configuration"
 msgstr "Configurazione aspetto biblioteca"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titolo"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Numero di libri casuali da mostrare"
@@ -1844,7 +1925,7 @@ msgstr "Numero di libri casuali da mostrare"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Numero di autori da mostrare prima di nascondere (0=disabilita mascheramento)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Tema"
 
@@ -1978,7 +2059,7 @@ msgstr "Aggiungi allo scaffale"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Pubblico)"
 
@@ -2030,7 +2111,7 @@ msgstr "Dominii bloccati per la registrazione (Blacklist)"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Se sicuro di voler eliminare questo dominio?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Prossimo"
 
@@ -2046,7 +2127,7 @@ msgstr "Crea un rapporto di segnalazione di un problema"
 msgid "Return to Home"
 msgstr "Ritorna alla pagina principale"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Raggruppa per serie"
 
@@ -2119,7 +2200,7 @@ msgid "Home"
 msgstr "Home"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Indietro"
 
@@ -2131,12 +2212,8 @@ msgstr "Alterna navigazione"
 msgid "Search Library"
 msgstr "Ricerca nella libreria"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Ricerca avanzata"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Configurazione"
 
@@ -2152,7 +2229,7 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registra"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Uploading..."
 
@@ -2164,27 +2241,23 @@ msgstr "Per favore non ricaricare la pagina"
 msgid "Browse"
 msgstr "Naviga"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "I tuoi scaffali"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Errore"
 
@@ -2216,30 +2289,50 @@ msgstr "Flusso attivo, non può essere visualizzato"
 msgid "Show Access Log: "
 msgstr "Mostra il log di accesso: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Seleziona le categorie consentite/negate"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Seleziona i valori personali consentiti/negati per le colonne"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Seleziona le categorie consentite/negate per l'utente"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Seleziona i valori personali consentiti/negati per le colonne dell'utente"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
-msgstr "Digita categorie"
+msgstr "Indica le categorie"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Aggiungi restrizioni di visualizzazione"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "Questo formato di libro viene rimosso definitivamente dal database"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Il libro verrà cancellato dal database di Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "e dal disco rigido"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Oservazione importante riguardo Kobo: i libri eliminati, rimarranno in ogni lettore Kobo accoppiato."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Prima di poter eliminare in sicurezza un libro, occorre che il libro venga archiviato e che l'apparecchio venga sincronizzato."
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Catalogo Calibre-Web"
@@ -2248,99 +2341,99 @@ msgstr "Catalogo Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Adatta il testo quando le barre laterali sono aperte."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie della tastiera"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Pagina precedente"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Pagina successiva"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Adatta al migliore"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Adatta alla larghezza"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Adatta all'altezza"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Dimensione originale"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Capovolgi immagine"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Chiaro"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Scuro"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Scala"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Migliore"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Larghezza"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Altezza"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Originale"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Ruota"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Capovolgi"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Verticale"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Orientamento"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Da sinistra a destra"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Da destra a sinistra"
 
@@ -2382,7 +2475,7 @@ msgstr "Il link scadrà tra 10 minuti."
 
 #: cps/templates/search.html:5
 msgid "No Results Found"
-msgstr "Nessun risultato"
+msgstr "Nessun risultato trovato"
 
 #: cps/templates/search.html:6
 msgid "Search Term:"
@@ -2392,39 +2485,39 @@ msgstr "Termine di ricerca:"
 msgid "Results for:"
 msgstr "risultati per:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Data di pubblicazione da"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Data di pubblicazione fino a"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Escludi categorie"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Escludi serie"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Escludi lingue"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Estensioni"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Escludi estensioni"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Valutazione superiore a"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Valutazione inferiore a"
 
@@ -2440,11 +2533,11 @@ msgstr "Modifica scaffale"
 msgid "Change order"
 msgstr "Cambia ordine"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Vuoi davvero eliminare questo scaffale?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Lo scaffale sarà perso per tutti e per sempre!"
 
@@ -2560,15 +2653,11 @@ msgstr "Aggiungi valori personali permessi/negati nelle colonne"
 msgid "Delete User"
 msgstr "Elimina questo utente"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Download recenti"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Genera un URL di autenticazione per Kobo"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vuoi veramente eliminare il token di Kobo?"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 7ae7b0a6..176d7694 100644
Binary files a/cps/translations/ja/LC_MESSAGES/messages.mo and b/cps/translations/ja/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 75447930..f57213c2 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "不明"
@@ -66,12 +66,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -139,15 +139,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
@@ -173,121 +173,121 @@ msgstr ""
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "不明なエラーが発生しました。"
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "テストメールが %(kindlemail)s に送信されました"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -299,103 +299,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
@@ -408,175 +403,154 @@ msgstr "Googleドライブの設定が完了していません。Googleドライ
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "ID: %(book)d の本に %(format)s フォーマットはありません"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Googleドライブ: %(fn)s に %(format)s はありません"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Kindleに送信"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "このメールはCalibre-Web経由で送信されました。"
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s がありません: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Kindleに送信"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "このメールはCalibre-Web経由で送信されました。"
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web テストメール"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "テストメール"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Webを始める"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "ユーザ: %(name)s 用の登録メール"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Kindleに %(format)s を送信"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s を %(format)s に変換してからKindleに送信"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "メール: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした。"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、著者名を %(src)s から %(dest)s に変更できませんでした。"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "エラー: %(error)s により、ファイルパスを %(src)s から %(dest)s に変更できませんでした。"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "待機中"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "開始"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "終了"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "不明"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "メール: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "変換: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "アップロード: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "不明なタスク: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
@@ -606,7 +580,7 @@ msgstr ""
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -711,7 +685,7 @@ msgstr "%(title)s を作成しました"
 msgid "There was an error"
 msgstr "エラーが発生しました"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
@@ -742,388 +716,426 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "最近追加した本"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "最近追加された本を表示"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "人気の本"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "読んだ本"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "未読の本"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr ""
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "見つける"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "ランダムで本を表示"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "カテゴリ選択を表示"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "シリーズ"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "シリーズ選択を表示"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "著者"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "著者選択を表示"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "出版社"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "出版社選択を表示"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "言語"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "言語選択を表示"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr ""
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr ""
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "アップデートはありません。すでに最新バージョンがインストールされています"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "アップデートが利用可能です。下のボタンをクリックして最新バージョンにアップデートしてください。"
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "アップデート情報を取得できません"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "アップデートが利用可能です。下のボタンをクリックしてバージョン: %(version)s にアップデートしてください。"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "最近追加された本"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "タスク"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "検索"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "これ以降に出版 "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "これ以前に出版 "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "評価 <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "評価 >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "検索"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "詳細検索"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "検索"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "タスク"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "これ以降に出版 "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "これ以前に出版 "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "評価 <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "評価 >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "このユーザ名またはメールアドレスはすでに使われています。"
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "ログイン"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "トークンが見つかりません"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "トークンが無効です"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Ebook-converter が失敗しました: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ebook-converter が失敗しました: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1162,7 +1174,7 @@ msgstr "アップロード"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "ダウンロード"
 
@@ -1175,8 +1187,9 @@ msgid "Edit"
 msgstr "編集"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "削除"
 
@@ -1321,16 +1334,16 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr ""
 
@@ -1350,20 +1363,19 @@ msgstr "経由"
 msgid "In Library"
 msgstr "ライブラリ内"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr ""
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "減らす"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr ""
 
@@ -1395,17 +1407,17 @@ msgstr "変換先:"
 msgid "Convert book"
 msgstr "本を変換"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "本のタイトル"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "著者"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "詳細"
 
@@ -1413,15 +1425,15 @@ msgstr "詳細"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1429,7 +1441,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "タグ"
 
@@ -1453,9 +1465,9 @@ msgstr ""
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "出版社"
 
@@ -1464,11 +1476,11 @@ msgstr "出版社"
 msgid "Language"
 msgstr "言語"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "はい"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "いいえ"
 
@@ -1480,7 +1492,7 @@ msgstr ""
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr ""
 
@@ -1490,60 +1502,133 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "よろしいですか?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr ""
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr ""
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "キーワード"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr "キーワードを検索"
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "カバー画像をクリックしてメタデータをフォームに読み込んでください"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "閉じる"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "ソース"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "検索エラー"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "検索結果が見つかりません。別のキーワードで検索してみてください。"
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "タイトル"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "よろしいですか?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "ライブラリ設定"
@@ -1833,10 +1918,6 @@ msgstr "ログイン"
 msgid "View Configuration"
 msgstr "表示設定"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "タイトル"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr ""
@@ -1845,7 +1926,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "テーマ"
 
@@ -1979,7 +2060,7 @@ msgstr "本棚に追加"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2031,7 +2112,7 @@ msgstr ""
 msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "次"
 
@@ -2047,7 +2128,7 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr ""
 
@@ -2120,7 +2201,7 @@ msgid "Home"
 msgstr "ホーム"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "戻る"
 
@@ -2132,12 +2213,8 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "詳細検索"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "設定"
 
@@ -2153,7 +2230,7 @@ msgstr "ログアウト"
 msgid "Register"
 msgstr "登録"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -2165,27 +2242,23 @@ msgstr ""
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "あなたの本棚"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "本の詳細"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "エラー"
 
@@ -2217,30 +2290,50 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2249,99 +2342,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "前のページ"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "次のページ"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "最適なサイズにする"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "オリジナルのサイズにする"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "右に回転する"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "左に回転する"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "画像を反転する"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "ライト"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "ダーク"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "サイズ"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "最適"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "オリジナル"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "回転"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "反転"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "水平方向"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "垂直方向"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "読む方向"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "左から右"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "右から左"
 
@@ -2393,39 +2486,39 @@ msgstr ""
 msgid "Results for:"
 msgstr "結果:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr ""
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "タグを除外"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "シリーズを除外"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "言語を除外"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2441,11 +2534,11 @@ msgstr "本棚を編集"
 msgid "Change order"
 msgstr "順番を変更"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr ""
 
@@ -2561,15 +2654,11 @@ msgstr ""
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "最近のダウンロード"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 3f583578..4ea20a05 100644
Binary files a/cps/translations/km/LC_MESSAGES/messages.mo and b/cps/translations/km/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index c9899509..8dd365b6 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -47,9 +47,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "មិនដឹង"
@@ -67,12 +67,12 @@ msgid "Calibre-Web configuration updated"
 msgstr ""
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
@@ -122,7 +122,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -140,15 +140,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr ""
 
@@ -174,121 +174,121 @@ msgstr ""
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -300,103 +300,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -409,173 +404,152 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "ផ្ញើទៅ Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "ផ្ញើទៅ Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "អ៊ីមែល៖ %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "ប្តូរចំណងជើងពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "ប្តូរអ្នកនិពន្ធពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/helper.py:750
-msgid "Unknown Status"
-msgstr ""
-
 #: cps/helper.py:755
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
+msgid "Unknown Status"
 msgstr ""
 
 #: cps/kobo_auth.py:130
@@ -607,7 +581,7 @@ msgstr ""
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -712,7 +686,7 @@ msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
@@ -743,388 +717,426 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "ទើបបន្ថែមថ្មីៗ"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "បង្ហាញសៀវភៅមកថ្មី"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "សៀវភៅដែលមានប្រជាប្រិយភាព"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "បង្ហាញសៀវភៅដែលមានប្រជាប្រិយភាព"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr ""
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "ស្រាវជ្រាវ"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "បង្ហាញជម្រើសប្រភេទ"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "ស៊េរី"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "បង្ហាញជម្រើសស៊េរី"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "អ្នកនិពន្ធ"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr ""
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "ភាសានានា"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "បង្ហាញផ្នែកភាសា"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr ""
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr ""
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "សៀវភៅដែលទើបបានបន្ថែម"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "កិច្ចការនានា"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "ស្វែងរក"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "បានបោះពុម្ភក្រោយ  "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "បានបោះពុម្ភមុន  "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "ការវាយតម្លៃ <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "ការវាយតម្លៃ >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "ស្វែងរក"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "ស្វែងរកកម្រិតខ្ពស់"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "ស្វែងរក"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "កិច្ចការនានា"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "បានបោះពុម្ភក្រោយ  "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "បានបោះពុម្ភមុន  "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "ការវាយតម្លៃ <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "ការវាយតម្លៃ >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "ចូលប្រើ"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "រកមិនឃើញវត្ថុតាង"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "វត្ថុតាងហួសពេលកំណត់"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "បញ្ជីអ្នកប្រើប្រាស់"
@@ -1163,7 +1175,7 @@ msgstr "អាប់ឡូដ"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "ទាញយក"
 
@@ -1176,8 +1188,9 @@ msgid "Edit"
 msgstr "កែប្រែ"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "លុប"
 
@@ -1322,16 +1335,16 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "បាទ/ចាស"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr ""
 
@@ -1351,20 +1364,19 @@ msgstr "តាមរយៈ"
 msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr ""
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "បន្ថែមទៀតដោយ"
 
@@ -1396,17 +1408,17 @@ msgstr ""
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "ចំណងជើងសៀវភៅ"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "អ្នកនិពន្ធ"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "ពិពណ៌នា"
 
@@ -1414,15 +1426,15 @@ msgstr "ពិពណ៌នា"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Tag"
 
@@ -1454,9 +1466,9 @@ msgstr ""
 msgid "Published Date"
 msgstr "ថ្ងៃបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "អ្នកបោះពុម្ភ"
 
@@ -1465,11 +1477,11 @@ msgstr "អ្នកបោះពុម្ភ"
 msgid "Language"
 msgstr "ភាសា"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "ទេ"
 
@@ -1481,7 +1493,7 @@ msgstr "ទម្រង់អាប់ឡូដ"
 msgid "View Book on Save"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
@@ -1491,60 +1503,133 @@ msgstr "មើលទិន្នន័យមេតា"
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr ""
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "និងពីថាសរឹង"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "ពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "បិទ"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "ប្រភព"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "ការស្វែងរកមានកំហុស!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "ចំណងជើង"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr ""
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "ការកំណត់បណ្ណាល័យ"
@@ -1834,10 +1919,6 @@ msgstr "ចូលប្រើប្រាស់"
 msgid "View Configuration"
 msgstr "មើលការកំណត់"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "ចំណងជើង"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "ចំនួនសៀវភៅចៃដន្យដើម្បីបង្ហាញ"
@@ -1846,7 +1927,7 @@ msgstr "ចំនួនសៀវភៅចៃដន្យដើម្បីបង
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "ការតុបតែង"
 
@@ -1980,7 +2061,7 @@ msgstr "បន្ថែមទៅធ្នើ"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2032,7 +2113,7 @@ msgstr ""
 msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "បន្ទាប់"
 
@@ -2048,7 +2129,7 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr ""
 
@@ -2121,7 +2202,7 @@ msgid "Home"
 msgstr ""
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "មកក្រោយ"
 
@@ -2133,12 +2214,8 @@ msgstr "បិទ/បើកការរុករក"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "ស្វែងរកកម្រិតខ្ពស់"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "ការកំណត់"
 
@@ -2154,7 +2231,7 @@ msgstr "ចេញពីការប្រើប្រាស់"
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
@@ -2166,27 +2243,23 @@ msgstr ""
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "ធ្នើរបស់អ្នក"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr ""
 
@@ -2218,30 +2291,50 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "និងពីថាសរឹង"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2250,99 +2343,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំងចំហៀង។"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr ""
 
@@ -2394,39 +2487,39 @@ msgstr ""
 msgid "Results for:"
 msgstr "លទ្ធផលសម្រាប់៖"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "ថ្ងៃបោះពុម្ភចាប់ពី"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "ថ្ងៃបោះពុម្ភរហូតដល់"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "លើកលែង tag"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "លើកលែងស៊េរី"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "លើកលែងភាសា"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "ការវាយតម្លៃលើសពី"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "ការវាយតម្លៃតិចជាង"
 
@@ -2442,11 +2535,11 @@ msgstr ""
 msgid "Change order"
 msgstr "ប្តូរលំដាប់"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "ធ្នើនេះនឹងបាត់បង់ជាអចិន្ត្រៃយ៍សម្រាប់គ្រប់គ្នា!"
 
@@ -2562,15 +2655,11 @@ msgstr ""
 msgid "Delete User"
 msgstr "លុបអ្នកប្រើប្រាស់នេះ"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "ការទាញយកថ្មីៗ"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index e600041f..ac35fb36 100644
Binary files a/cps/translations/nl/LC_MESSAGES/messages.mo and b/cps/translations/nl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index b70ca9c2..e08d0de6 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-05-10 21:00+0200\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -47,9 +47,9 @@ msgstr "Opnieuw verbinden gelukt"
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Onbekend"
@@ -67,12 +67,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Weigeren"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Toestaan"
 
@@ -122,7 +122,7 @@ msgstr "SSL-sleutellocatie is niet geldig, voer een geldige locatie in"
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldige locatie in"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -140,15 +140,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
@@ -174,121 +174,121 @@ msgstr "Kan laatste systeembeheerder niet verwijderen"
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-mail verstuurd naar %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Fout opgetreden bij het versturen van de test-e-mail: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
@@ -300,103 +300,98 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "Het boekformaat is verwijderd"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Kan e-boek niet openen: het bestand bestaat niet of is ontoegankelijk"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "De bestandsextensie '%(ext)s' is niet toegestaan op deze server"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken, controleer het logbestand"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Bestand %(filename)s kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Geüpload boek staat mogelijk al in de bibliotheek, controleer alvorens door te gaan: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Bestand %(file)s niet verplaatst: %(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Omslag %(file)s niet verplaatst: %(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Het boek is in de wachtrij geplaatst voor conversie naar %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Er is een fout opgetreden bij het converteren van dit boek: %(res)s"
@@ -409,175 +404,154 @@ msgstr "Het instellen van Google Drive is niet afgerond, heractiveer Google Driv
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Het callback-domein is niet geverifieerd. Volg de stappen in de Google-ontwikkelaarsconsole om het domein te verifiëren"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formaat niet gevonden voor boek met id: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s niet aangetroffen op Google Drive: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Versturen naar Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Deze e-mail is verstuurd via Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s niet gevonden %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Versturen naar Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Deze e-mail is verstuurd via Calibre-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web - test-e-mail"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Test-e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Aan de slag met Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registratie-e-mailadres van gebruiker: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s versturen naar Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s converteren naar %(format)s en versturen naar Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Het opgevraagde bestand kan niet worden uitgelezen. Ben je hiertoe gemachtigd?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Verwijderen van boek %(id)s mislukt: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de naam '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Kan de auteursnaam '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan het bestand in '%(src)s' niet wijzigen naar '%(dest)s': %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Locatie aanmaken voor omslag mislukt"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Omslag-bestand is geen afbeelding of kon niet opgeslagen worden"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Alleen jpg/jpeg/png/webp bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Alleen jpg/jpeg bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Wachten"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mailadres: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Converteren: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Uploaden: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Onbekende taak: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Je kunt Calibre-Web niet vanaf de lokale computer openen om een geldige api_endpoint te krijgen voor je kobo toestel"
@@ -607,7 +581,7 @@ msgstr "Inloggen bij Google mislukt."
 msgid "Failed to fetch user info from Google."
 msgstr "Opvragen gebruikersinfo bij Google mislukt."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -712,7 +686,7 @@ msgstr "Boekenplank '%(title)s' aangemaakt"
 msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Boekenplank maken"
 
@@ -743,388 +717,426 @@ msgstr "Verborgen boek"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde bewerken van boekenplank: '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Recent toegevoegd"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Recent toegevoegde boeken tonen"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Populaire boeken"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Populaire boeken tonen"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Ongelezen boeken tonen"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Willekeurige boeken"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Willekeurige boeken tonen"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Categorieën"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Categoriekeuze tonen"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Boekenreeksen"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Boekenreeksenkeuze tonen"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Uitgevers"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Uitgeverskeuze tonen"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Talen"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Taalkeuze tonen"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Beoordelingen"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Beoordelingen tonen"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Bestandsformaten"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Onverwachte gegevens tijdens het uitlezen van de update-informatie"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Er is geen update beschikbaar."
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar de nieuwste versie."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "De update-informatie kan niet worden opgehaald"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Geen update-informatie beschikbaar"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar versie: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klik op onderstaande knop om de laatste stabiele versie te installeren."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "Gebruiker is geïmporteerd"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Recent toegevoegde boeken"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Boeken"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oeps! Geselecteerd boek is niet beschikbaar. Bestand bestaat niet of is niet toegankelijk"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Beoordelingen"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Alle bestandsformaten"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Taken"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Zoeken"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Gepubliceerd na "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Gepubliceerd vóór "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Beoordeling <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Beoordeling >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "zoeken"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Geavanceerd zoeken"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Zoeken"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Beoordelingen"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Alle bestandsformaten"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Taken"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Gepubliceerd na "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Gepubliceerd vóór "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Beoordeling <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Beoordeling >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "registreren"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Er is een bevestigings-e-mail verstuurd naar je e-mailadres."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Gebruikersnaam of e-mailadres is al in gebruik."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "inloggen"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Toegangssleutel niet gevonden"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Toegangssleutel is verlopen"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "E-boek-conversie mislukt: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "E-boek-conversie mislukt: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Gebruikerslijst"
@@ -1163,7 +1175,7 @@ msgstr "Uploaden"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Downloaden"
 
@@ -1176,8 +1188,9 @@ msgid "Edit"
 msgstr "Bewerken"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1322,16 +1335,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "Oké"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1351,20 +1364,19 @@ msgstr "via"
 msgid "In Library"
 msgstr "In bibliotheek"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Alles"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "beperken"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Meer van"
 
@@ -1396,17 +1408,17 @@ msgstr "Converteren naar:"
 msgid "Convert book"
 msgstr "Boek converteren"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Boektitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -1414,15 +1426,15 @@ msgstr "Omschrijving"
 msgid "Identifiers"
 msgstr "Identificatoren"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "Identificatie type"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "Identificatie waarde"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1430,7 +1442,7 @@ msgstr "Verwijderen"
 msgid "Add Identifier"
 msgstr "Identificator toevoegen"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Labels"
 
@@ -1454,9 +1466,9 @@ msgstr "Omslag uploaden vanaf de harde schijf"
 msgid "Published Date"
 msgstr "Publicatiedatum"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Uitgever"
 
@@ -1465,11 +1477,11 @@ msgstr "Uitgever"
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nee"
 
@@ -1481,7 +1493,7 @@ msgstr "Uploadformaat"
 msgid "View Book on Save"
 msgstr "Boek inkijken na bewerking"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
@@ -1491,60 +1503,133 @@ msgstr "Metagegevens ophalen"
 msgid "Save"
 msgstr "Opslaan"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Weet je het zeker?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Het boek wordt verwijderd uit de Calibre-database"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "en van de harde schijf"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Trefwoord"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Trefwoord zoeken "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Klik op de omslag om de metagegevens in het formulier te laden"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Sluiten"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Zoekfout!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Geen resultaten gevonden! Gebruik een ander trefwoord."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Weet je het zeker?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Bibliotheekinstellingen"
@@ -1834,10 +1919,6 @@ msgstr "Inloggen"
 msgid "View Configuration"
 msgstr "Instellingen bekijken"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Aantal te tonen willekeurige boeken"
@@ -1846,7 +1927,7 @@ msgstr "Aantal te tonen willekeurige boeken"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Aantal te tonen auteurs alvorens te verbergen (0=nooit verbergen)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Thema"
 
@@ -1980,7 +2061,7 @@ msgstr "Toevoegen aan boekenplank"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Openbaar)"
 
@@ -2032,7 +2113,7 @@ msgstr "Geweigerde domeinen voor registratie"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Weet je zeker dat je deze domeinregel wilt verwijderen?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Volgende"
 
@@ -2048,7 +2129,7 @@ msgstr "Probleem melden"
 msgid "Return to Home"
 msgstr "Terug naar startpagina"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Sorteren op reeks"
 
@@ -2121,7 +2202,7 @@ msgid "Home"
 msgstr "Startpagina"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Annuleren"
 
@@ -2133,12 +2214,8 @@ msgstr "Navigatie aanpassen"
 msgid "Search Library"
 msgstr "Zoek in bibliotheek"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Geavanceerd zoeken"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -2154,7 +2231,7 @@ msgstr "Afmelden"
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
@@ -2166,27 +2243,23 @@ msgstr "Deze pagina niet vernieuwen"
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Jouw boekenplanken"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informatie"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Boekgegevens"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Fout"
 
@@ -2218,30 +2291,50 @@ msgstr "Stream uitvoer, kan niet worden weergegeven"
 msgid "Show Access Log: "
 msgstr "Toon toegangslog: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Selecteer toegestane/geweigerde tags"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Selecteer toegestane/geweigerde aangepaste kolom waarden"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Selecteer toegestane/geweigerde tags van gebruikers"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Selecteer toegestane/geweigerde aangepaste kolom waarden van gebruikers"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Voer Tag in"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Voeg inkijk restrictie toe"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Het boek wordt verwijderd uit de Calibre-database"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "en van de harde schijf"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web - e-boekcatalogus"
@@ -2250,99 +2343,99 @@ msgstr "Calibre-Web - e-boekcatalogus"
 msgid "Reflow text when sidebars are open."
 msgstr "Tekstindeling automatisch aanpassen als het zijpaneel geopend is."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Vorige pagina"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Volgende pagina"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Optimaal inpassen"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Aanpassen aan breedte"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Aanpassen aan hoogte"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Ware grootte"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Rechtsom draaien"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Linksom draaien"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Afbeelding omdraaien"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Licht"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Donker"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Schaal"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Breedte"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Hoogte"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Ware grootte"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Draaien"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Omdraaien"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Richting"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Links-naar-rechts"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Rechts-naar-links"
 
@@ -2394,39 +2487,39 @@ msgstr "Zoekterm:"
 msgid "Results for:"
 msgstr "Resultaten voor:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Publicatiedatum van"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Publicatiedatum tot"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Labels uitsluiten"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Boekenreeksen uitsluiten"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Talen uitsluiten"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Extenties"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Extenties uitsluiten"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Met beoordeling hoger dan"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Met beoordeling lager dan"
 
@@ -2442,11 +2535,11 @@ msgstr "Boekenplank bewerken"
 msgid "Change order"
 msgstr "Volgorde aanpassen"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Boekenplank wordt permanent verwijderd voor iedereen"
 
@@ -2562,15 +2655,11 @@ msgstr "Voeg toegestane/geweigerde aangepaste kolom waarden toe"
 msgid "Delete User"
 msgstr "Deze gebruiker verwijderen"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Recente downloads"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Genereer Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Wil je werkelijk je Kobo Token verwijderen?"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 4721f31b..07008d7e 100644
Binary files a/cps/translations/pl/LC_MESSAGES/messages.mo and b/cps/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 904646e8..e5350b16 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2019-08-06 18:35)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-08-30 21:05+0200\n"
 "Last-Translator: Jerzy Piątek <jerzy.piatek@gmail.com>\n"
 "Language: pl\n"
@@ -48,9 +48,9 @@ msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Nieznany"
@@ -68,12 +68,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zabroń"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Zezwalaj"
 
@@ -123,7 +123,7 @@ msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ście
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -141,15 +141,15 @@ msgstr "Baza danych nie jest zapisywalna"
 msgid "Basic Configuration"
 msgstr "Konfiguracja podstawowa"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
@@ -175,123 +175,123 @@ msgstr "Nie można usunąć użytkownika. Brak na serwerze innego konta z prawam
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nie można odebrać praw administratora. Brak na serwerze innego konta z prawami administratora"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testowy e-mail pomyślnie przesłany do %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania e-maila testowego: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
 # ???
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
@@ -303,103 +303,98 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "Plik książki w wybranym formacie został usunięty"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Błąd podczas otwierania e-booka. Plik nie istnieje lub jest niedostępny"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s nie jest prawidłowym językiem"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku '%(ext)s' nie jest dozwolone do wysłania na ten serwer"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do wysłania musi mieć rozszerzenie"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Format pliku %(ext)s dodany do %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Błąd podczas edycji książki, sprawdź plik dziennika, aby uzyskać szczegółowe informacje"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Nie można zapisać pliku %(filename)s w katalogu tymczasowym"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Wysłana książka prawdopodobnie istnieje w bibliotece, rozważ zmianę przed przesłaniem nowej: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "Nie udało się przenieść pliku %(file)s:%(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Nie udało się przenieść pliku okładki %(file)s:%(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Książka została pomyślnie umieszczona w zadaniach do konwersji %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
@@ -412,177 +407,156 @@ msgstr "Konfiguracja Google Drive nie została zakończona, spróbuj dezaktywowa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Zwrotna domena nie jest zweryfikowana, proszę zweryfikowania domenę w konsoli deweloperskiej google"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Nie znaleziono formatu %(format)s dla id książki: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Nie znaleziono %(format)s na Google Drive: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Wyślij do Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ten e-mail został wysłany za pośrednictwem Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nie znaleziono: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Wyślij do Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Ten e-mail został wysłany za pośrednictwem Calibre-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Testowy e-mail Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Testowy e-mail"
 
 # ???
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Zacznij korzystać z Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rejestracja e-mail dla użytkownika: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Wyślij %(format)s do Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konwertuj %(orig)s do %(format)s i wyślij do Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
 # ???
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Żądany plik nie mógł zostać odczytany. Sprawdź uprawnienia?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Usuwanie książki %(id)s zakończyło się błędem: %(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "Usuwanie książki %(id)s, ścieżka książki jest niepoprawna: %(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Zmiana nazwy tytułu z: „%(src)s” na „%(dest)s” zakończyła się błędem: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Zmiana autora z: '%(src)s' na '%(dest)s' zakończyło się błędem: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Zmiana nazwy pliku w ścieżce '%(src)s' na '%(dest)s' zakończyło się błędem: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Nie znaleziono ścieżki do książki %(path)s na Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "Błąd przy pobieraniu okładki"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "Błędny format okładki"
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Nie udało się utworzyć ścieżki dla okładki"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Plik okładki nie jest poprawnym plikiem obrazu lub nie mógł zostać zapisany"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg/png/webp"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Nieudane"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Rozpoczynanie"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Zakończone"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konwertowanie: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Wyślij: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Nieznane zadanie: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Aby uzyskać prawidłowy api_endpoint dla urządzenia Kobo, należy skorzystać z dostępu do calibre-web spoza localhost"
@@ -613,7 +587,7 @@ msgstr "Nie udało się zalogować do Google."
 msgid "Failed to fetch user info from Google."
 msgstr "Nie udało się pobrać informacji o użytkowniku z Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -718,7 +692,7 @@ msgstr "Półka %(title)s została utworzona"
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
@@ -749,388 +723,426 @@ msgstr "Ukryta książka"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Ostatnio dodane"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Pokaż menu ostatnio dodanych książek"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Najpopularniejsze"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Pokaż menu najpopularniejszych książek"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Przeczytane"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Pokaż nieprzeczytane"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Odkrywaj"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Pokaż menu losowych książek"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Kategorie"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Pokaż menu wyboru kategorii"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Cykle"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Pokaż menu wyboru cyklu"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Autorzy"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Wydawcy"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Pokaż menu wyboru wydawcy"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Języki"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Pokaż menu wyboru języka"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Oceny"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Pokaż menu listy ocen"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Formaty plików"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Nieoczekiwane dane podczas odczytywania informacji o aktualizacji"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Brak dostępnej aktualizacji. Masz już zainstalowaną najnowszą wersję"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktualizować do najnowszej wersji."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Nie można pobrać informacji o aktualizacji"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Brak dostępnych informacji o wersji"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktualizować do wersji: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Kliknij przycisk poniżej, aby zaktualizować do najnowszej stabilnej wersji."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Przynajmniej jeden użytkownik LDAP nie został znaleziony w bazie danych"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "Użytkownik pomyślnie zaimportowany"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Ostatnio dodane książki"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Książki"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub jest niedostępny"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Lista z ocenami"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Lista formatów"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Zadania"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Szukaj"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Opublikowane po "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Opublikowane przed "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Ocena <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Ocena >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "szukaj"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Wyszukiwanie"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Szukaj"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Lista z ocenami"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Lista formatów"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Zadania"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Opublikowane po "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Opublikowane przed "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Ocena <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Ocena >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Wiadomość e-mail z potwierdzeniem została wysłana na Twoje konto e-mail."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Ta nazwa użytkownika lub adres e-mail jest już używany."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Nowe hasło zostało wysłane na Twój adres e-mail"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Nie znaleziono tokenu"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Token wygasł"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Nie znaleziono narzędzia calibre %(tool)s do konwertowania"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Konwertowanie nie powiodło się: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter spowodowało błąd: %(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Konwertowany plik nie został znaleziony, lub więcej niż jeden plik w folderze %(folder)s"
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Konwertowanie nie powiodło się: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Lista użytkowników"
@@ -1171,7 +1183,7 @@ msgstr "Wysyłanie"
 # ???
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Pobieranie"
 
@@ -1185,8 +1197,9 @@ msgstr "Edycja"
 
 # ???
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1331,16 +1344,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1361,20 +1374,19 @@ msgid "In Library"
 msgstr "W Bibliotece"
 
 # ???
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Wszystko"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "zwiń"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Więcej według"
 
@@ -1407,17 +1419,17 @@ msgstr "Konwertuj na:"
 msgid "Convert book"
 msgstr "Konwertuj książkę"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Tytuł książki"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Opis"
 
@@ -1425,15 +1437,15 @@ msgstr "Opis"
 msgid "Identifiers"
 msgstr "Identyfikatory"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "Rodzaj identyfikatora"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "Wartość identyfikatora"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1441,7 +1453,7 @@ msgstr "Usuń"
 msgid "Add Identifier"
 msgstr "Dodaj identyfikator"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Etykiety"
 
@@ -1465,9 +1477,9 @@ msgstr "Wyślij okładkę z dysku lokalnego"
 msgid "Published Date"
 msgstr "Data publikacji"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Wydawca"
 
@@ -1476,11 +1488,11 @@ msgstr "Wydawca"
 msgid "Language"
 msgstr "Język"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Tak"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nie"
 
@@ -1492,7 +1504,7 @@ msgstr "Wyślij format"
 msgid "View Book on Save"
 msgstr "Po zapisaniu wyświetl szczegóły książki"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
@@ -1502,61 +1514,133 @@ msgstr "Uzyskaj metadane"
 msgid "Save"
 msgstr "Zapisz"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Czy jesteś pewny?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Książka zostanie usunięta z bazy danych Calibre"
-
-# ???
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "i z dysku twardego"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Ważne dla Kobo: usunięte książki pozostaną na każdym połączonym urządzeniu Kobo."
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "Książki muszą najpierw zostać zarchiwizowane a urządzenie zsynchronizowane, zanim książka będzie mogła zostać bezpiecznie usunięta."
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Kliknij okładkę, aby załadować metadane do formularza"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Zamknij"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Źródło"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nie znaleziono! Spróbuj użyć innego słowa kluczowego."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Tytuł"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Czy jesteś pewny?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Konfiguracja biblioteki"
@@ -1847,10 +1931,6 @@ msgstr "Zaloguj się"
 msgid "View Configuration"
 msgstr "Konfiguracja widoku"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Tytuł"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Liczba losowych książek do pokazania"
@@ -1859,7 +1939,7 @@ msgstr "Liczba losowych książek do pokazania"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Liczba autorów do pokazania przed ukryciem (0=wyłącza ukrywanie)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Motyw"
 
@@ -1993,7 +2073,7 @@ msgstr "Dodaj do półki"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(publiczna)"
 
@@ -2045,7 +2125,7 @@ msgstr "Domeny zabronione (czarna lista)"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Czy na pewno chcesz usunąć tę domenę?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Następne"
 
@@ -2063,7 +2143,7 @@ msgstr "Zgłoś błąd"
 msgid "Return to Home"
 msgstr "Powrót do głównego menu"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Grupuj według cyklu"
 
@@ -2136,7 +2216,7 @@ msgid "Home"
 msgstr "Główne menu"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Wróć"
 
@@ -2148,12 +2228,8 @@ msgstr "Przełącz nawigację"
 msgid "Search Library"
 msgstr "Przeszukaj bibliotekę"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Wyszukiwanie"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -2169,7 +2245,7 @@ msgstr "Wyloguj się"
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Wysyłanie…"
 
@@ -2181,29 +2257,25 @@ msgstr "Proszę nie odświeżać strony"
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Twoje półki"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informacje"
 
 # ???
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
 # ???
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Błąd"
 
@@ -2235,30 +2307,51 @@ msgstr "Nie można wyświetlić wyjścia"
 msgid "Show Access Log: "
 msgstr "Pokaż dziennik dostępu: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Wybierz dozwolone/zabronione etykiety"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Wybierz dozwolone/zabronione etykiety użytkownika"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Wybierz dozwolone/zabronione wartości własnych kolumn użytkownika"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Wpisz etykietę"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Dodaj ograniczenie przeglądania"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Książka zostanie usunięta z bazy danych Calibre"
+
+# ???
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "i z dysku twardego"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Ważne dla Kobo: usunięte książki pozostaną na każdym połączonym urządzeniu Kobo."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "Książki muszą najpierw zostać zarchiwizowane a urządzenie zsynchronizowane, zanim książka będzie mogła zostać bezpiecznie usunięta."
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Katalog e-booków Calibre-Web"
@@ -2267,99 +2360,99 @@ msgstr "Katalog e-booków Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Przepływ tekstu, gdy paski boczne są otwarte."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiaturowe"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Poprzednia strona"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Następna strona"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Skaluj do najlepszego"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Skaluj do szerokości"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Skaluj do wysokości"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Skaluj do wielkości oryginalnej"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Odwórć obraz"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Jasny"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Ciemny"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Skaluj"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Najlepszy"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Szerokość"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Wysokość"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Natywnie"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Obrót"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Odwróć"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Kierunek"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Od lewej do prawej"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Od prawej do lewej"
 
@@ -2411,39 +2504,39 @@ msgstr "Wyszukiwano:"
 msgid "Results for:"
 msgstr "Wyniki dla:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Data publikacji od"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Data publikacji do"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Wyklucz etykiety"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Wyklucz cykle"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Wyklucz języki"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Wyklucz rozszerzenia"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Ocena większa niż"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Ocena mniejsza niż"
 
@@ -2459,11 +2552,11 @@ msgstr "Edytuj półkę"
 msgid "Change order"
 msgstr "Zmień sortowanie"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz usunąć półkę?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Półka zostanie usunięta dla wszystkich użytkowników"
 
@@ -2581,16 +2674,11 @@ msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn"
 msgid "Delete User"
 msgstr "Usuń tego użytkownika"
 
-# ???
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Ostatnio pobrane"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Generuj Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Czy na pewno chcesz usunąć Token Kobo?"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 34cf0171..9dae6beb 100644
Binary files a/cps/translations/ru/LC_MESSAGES/messages.mo and b/cps/translations/ru/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 4d81afd4..a104b76f 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -47,9 +47,9 @@ msgstr "Успешно переподключено"
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -67,12 +67,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Запретить"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Разрешить"
 
@@ -122,7 +122,7 @@ msgstr "Расположение ключевого файла неверно, 
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -140,15 +140,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
@@ -174,121 +174,121 @@ msgstr "Это последний администратор, невозможн
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Тестовое письмо успешно отправлено на %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
@@ -300,103 +300,98 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Ошибка при открытии eBook. Файл не существует или файл недоступен"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Файл %(filename)s не удалось сохранить во временную папку"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
@@ -409,175 +404,154 @@ msgstr "Настройка Google Drive не завершена, попробу
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s форма не найден для книги с id: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s не найден на Google Drive: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Отправить на Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Это электронное письмо было отправлено через Caliber-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s не найден: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Отправить на Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Это электронное письмо было отправлено через Caliber-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Тестовый e-mail для Calibre-Web"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Тестовый e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Начать работу с Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Регистрационный e-mail для пользователя: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Отправить %(format)s в Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Преобразовать %(orig)s в %(format)s и отправить в Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Эл. почта: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Запрашиваемый файл не может быть прочитан. Возможно у вас нет разрешения?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Переименовывание заголовка с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Переименовывание автора с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Не удалось переименовать файл по пути '%(src)s' to '%(dest)s' из-за ошибки: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Файл %(file)s не найден на Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Не удалось создать путь для обложки."
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Только файлы jpg / jpeg / png / webp поддерживаются в качестве файла обложки"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Только файлы в формате jpg / jpeg поддерживаются как файл обложки"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Начало"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Завершено"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Конвертировать: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Загрузить: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Неизвестная задача: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Пожалуйста, подключитесь к Calibre-Web не с локального хоста, чтобы получить действительный api_endpoint для устройства Kobo"
@@ -607,7 +581,7 @@ msgstr "Не удалось войти в систему с помощью Googl
 msgid "Failed to fetch user info from Google."
 msgstr "Не удалось получить информацию о пользователе из Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -712,7 +686,7 @@ msgstr "Создана полка %(title)s"
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Создать полку"
 
@@ -743,388 +717,426 @@ msgstr "Скрытая книга"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Недавно Добавленные"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Показывать недавние книги"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Популярные Книги"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Показывать популярные книги"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Показать непрочитанное"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Обзор"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Показывать случайные книги"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Категории"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Показывать выбор категории"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Серии"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Показывать выбор серии"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Авторы"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Издатели"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Показать выбор издателя"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Языки"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Показывать выбор языка"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Рейтинги"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Показать выбор рейтинга"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Форматы файлов"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Некорректные данные при чтении информации об обновлении"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Нет доступных обновлений. Вы используете последнюю версию"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Новое обновление доступно. Нажмите на кнопку ниже, чтобы обновить до последней версии."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Не удалось получить информацию об обновлении"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Информация о выпуске недоступна"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Новое обновление доступно. Нажмите на кнопку ниже, чтобы обновиться до версии: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Нажмите на кнопку ниже для обновления до последней стабильной версии."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "Пользователь успешно импортирован"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Недавно Добавленные Книги"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Книги"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Список рейтингов"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Список форматов файлов"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Задания"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Поиск"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Опубликовано после "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Опубликовано до "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Рейтинг <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Рейтинг >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "поиск"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Расширенный поиск"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Поиск"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Список рейтингов"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Список форматов файлов"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Задания"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Опубликовано после "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Опубликовано до "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Рейтинг <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Рейтинг >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "регистрация"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Этот никнейм или e-mail уже используются."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "войти"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Ключ не найден"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Ключ просрочен"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Читать Книгу"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "Ошибка Ebook-конвертора: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "Ошибка Ebook-конвертора: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Список пользователей"
@@ -1163,7 +1175,7 @@ msgstr "Загрузить"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Скачать"
 
@@ -1176,8 +1188,9 @@ msgid "Edit"
 msgstr "Редактировать"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1322,16 +1335,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1351,20 +1364,19 @@ msgstr "с помощью"
 msgid "In Library"
 msgstr "В библиотеке"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Все"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "уменьшить"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Ещё от"
 
@@ -1396,17 +1408,17 @@ msgstr "Конвертировать в:"
 msgid "Convert book"
 msgstr "Конвертировать книгу"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Название книги"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Описание"
 
@@ -1414,15 +1426,15 @@ msgstr "Описание"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Теги"
 
@@ -1454,9 +1466,9 @@ msgstr "Загрузить обложку с диска"
 msgid "Published Date"
 msgstr "Опубликовано"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Издатель"
 
@@ -1465,11 +1477,11 @@ msgstr "Издатель"
 msgid "Language"
 msgstr "Язык"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Да"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Нет"
 
@@ -1481,7 +1493,7 @@ msgstr "Загружаемый формат"
 msgid "View Book on Save"
 msgstr "Просмотреть книгу после сохранения"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
@@ -1491,60 +1503,133 @@ msgstr "Получить метаданные"
 msgid "Save"
 msgstr "Сохранить"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Вы действительно уверены?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Книга будет удалена из базы данных Calibre"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "и с диска"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Поиск по ключевому слову "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Закрыть"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Источник"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Ошибка поиска!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Результат(ы) не найдены! Попробуйте другое ключевое слово."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Заголовок"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Вы действительно уверены?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Настройки библотеки"
@@ -1834,10 +1919,6 @@ msgstr "Логин"
 msgid "View Configuration"
 msgstr "Просмотреть Конфигурацию"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Заголовок"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Количество отображаемых случайных книг"
@@ -1846,7 +1927,7 @@ msgstr "Количество отображаемых случайных кни
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Количество авторов для отображения перед скрытием (0 = отключить скрытие)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Тема"
 
@@ -1980,7 +2061,7 @@ msgstr "Добавить на книжную полку"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(Публичная)"
 
@@ -2032,7 +2113,7 @@ msgstr "Запрещенные домены (черный список)"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Вы действительно желаете удалить это правило домена?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далее"
 
@@ -2048,7 +2129,7 @@ msgstr "Создать запись"
 msgid "Return to Home"
 msgstr "Вернуться на главную"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Сгрупировать по серии"
 
@@ -2121,7 +2202,7 @@ msgid "Home"
 msgstr "Главная"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Назад"
 
@@ -2133,12 +2214,8 @@ msgstr "Включить навигацию"
 msgid "Search Library"
 msgstr "Поиск в библиотеке"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Расширенный поиск"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Настройки"
 
@@ -2154,7 +2231,7 @@ msgstr "Выход"
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Загружается..."
 
@@ -2166,27 +2243,23 @@ msgstr "Пожалуйста не обновляйте страницу"
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Ваши полки"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Ошибка"
 
@@ -2218,30 +2291,50 @@ msgstr "Выходной поток, не может быть отображен
 msgid "Show Access Log: "
 msgstr "Показать журнал доступа: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Выбрать разрешенные / запрещенные теги"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Выбрать разрешенные / запрещенные значения индивидуальных столбцов"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Выбрать разрешенные / запрещенные теги пользователя"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Выбрать разрешенные / запрещенные значения индивидуальных столбцов пользователя"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Введите тег"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Добавить ограничение просмотра"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Книга будет удалена из базы данных Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "и с диска"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Каталог электронных книг Caliber-Web"
@@ -2250,99 +2343,99 @@ msgstr "Каталог электронных книг Caliber-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Обновить размещение текста при открытии боковой панели."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Предыдущая страница"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Следующая страница"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Масштабировать до лучшего"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Масштабироваать по ширине"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Масштабировать по высоте"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Масштабировать до оригинала"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Повернуть Вправо"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Повернуть Влево"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Перевернуть изображение"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Светлая"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Темная"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Масштаб"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Лучшее"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Ширина"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Длина"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Оригинальный"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Повернуть"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Перевернуть"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Горизонтально"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Вертикально"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Направление"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Слева направо"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Справа налево"
 
@@ -2394,39 +2487,39 @@ msgstr "Выражение для поиска:"
 msgid "Results for:"
 msgstr "Результаты для:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Опубликовано от"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Опубликовано до"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Исключить теги"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Исключить серии"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Исключить языки"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Расширения"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Исключить расширения"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Рейтинг больше чем"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Рейтинг меньше чем"
 
@@ -2442,11 +2535,11 @@ msgstr "Изменить Полку"
 msgid "Change order"
 msgstr "Изменить порядок"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Книжная полка будет безвозвратно удалена для всех"
 
@@ -2562,15 +2655,11 @@ msgstr "Добавить разрешенные / запрещенные зна
 msgid "Delete User"
 msgstr "Удалить этого пользователя"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Последние загрузки"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Создать Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Вы действительно хотите удалить Kobo Token ?"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 09d4b8cf..e7b3d480 100644
Binary files a/cps/translations/sv/LC_MESSAGES/messages.mo and b/cps/translations/sv/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index cfe65075..2a5e4f0a 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-03-14 09:30+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Okänd"
@@ -66,12 +66,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Förneka"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Tillåt"
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -139,15 +139,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
@@ -173,121 +173,121 @@ msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Hittade ett befintligt konto för den här e-postadressen."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Ett okänt fel uppstod."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-post skicka till %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Det gick inte att skicka Testmeddelandet: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -299,103 +299,98 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Det gick inte att öppna e-boken. Filen finns inte eller filen är inte tillgänglig"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Filändelsen '%(ext)s' får inte laddas upp till den här servern"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Det gick inte att skapa sökväg %(path)s (behörighet nekad)."
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Det gick inte att redigera boken, kontrollera loggfilen för mer information"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Filen %(filename)s kunde inte sparas i temp dir"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Uppladdad bok finns förmodligen i biblioteket, överväg att ändra innan du laddar upp nya: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Boken är i kö för konvertering till %(book_format)s"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
@@ -408,175 +403,154 @@ msgstr "Installationen av Google Drive är inte klar, försök att inaktivera oc
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Återuppringningsdomänen är inte verifierad, följ stegen för att verifiera domänen i Google utvecklarkonsol"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formatet hittades inte för bok-id: %(book)d"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s hittades inte på Google Drive: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Skicka till Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s hittades inte: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Skicka till Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web test e-post"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Test e-post"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Kom igång med Calibre-Web"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrera e-post för användare: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Skicka %(format)s till Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konvertera %(orig)s till %(format)s och skicka till Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-post: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Den begärda filen kunde inte läsas. Kanske fel behörigheter?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Byt namn på titel från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Byt namn på författare från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Byt namn på fil i sökvägen '%(src)s' till '%(dest)s' misslyckades med fel: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Filen %(file)s hittades inte på Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "Det gick inte att skapa sökväg för omslag"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "Endast jpg/jpeg/png/webp-filer stöds som omslagsfil"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Endast jpg/jpeg-filer stöds som omslagsfil"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Väntar"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Startad"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Klar"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "E-post: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Konvertera: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Överför: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Okänd uppgift: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Vänligen få tillgång till calibre-web från icke localhost för att få giltig api_endpoint för Kobo-enhet"
@@ -606,7 +580,7 @@ msgstr "Det gick inte att logga in med Google."
 msgid "Failed to fetch user info from Google."
 msgstr "Det gick inte att hämta användarinformation från Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -711,7 +685,7 @@ msgstr "Hyllan %(title)s skapad"
 msgid "There was an error"
 msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "skapa en hylla"
 
@@ -742,388 +716,426 @@ msgstr "Dold bok"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Nyligen tillagda"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Visa senaste böcker"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Heta böcker"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Visa heta böcker"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Lästa böcker"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Visa olästa"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Upptäck"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Visa slumpmässiga böcker"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Kategorier"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Visa kategorival"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Serier"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Visa serieval"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Författare"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Visa författarval"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Förlag"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Visa urval av förlag"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Språk"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Visa språkval"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Betyg"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Visa val av betyg"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Filformat"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Oväntade data vid läsning av uppdateringsinformation"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Ingen uppdatering tillgänglig. Du har redan den senaste versionen installerad"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att uppdatera till den senaste versionen."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Kunde inte hämta uppdateringsinformation"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att uppdatera till version: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicka på knappen nedan för att uppdatera till den senaste stabila versionen."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Nyligen tillagda böcker"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "Böcker"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Hoppsan! Vald boktitel är inte tillgänglig. Filen finns inte eller är inte tillgänglig"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Betygslista"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Lista över filformat"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Sök"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Publicerad efter "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Publicerad före "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Betyg <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Betyg >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "sök"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Avancerad sökning"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Sök"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Betygslista"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Lista över filformat"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Publicerad efter "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Publicerad före "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Betyg <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Betyg >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Boken är i kö för att skicka till %(kindlemail)s"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Det gick inte att skicka den här boken: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Konfigurera din kindle-e-postadress först..."
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "registrera"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Det här användarnamnet eller e-postadressen är redan i bruk."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "logga in"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Token hittades inte"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Token har löpt ut"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Läs en bok"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "E-bokkonverteraren misslyckades: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "E-bokkonverteraren misslyckades: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Användarlista"
@@ -1162,7 +1174,7 @@ msgstr "Ladda upp"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Hämta"
 
@@ -1175,8 +1187,9 @@ msgid "Edit"
 msgstr "Redigera"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1321,16 +1334,16 @@ msgid "Are you sure you want to restart?"
 msgstr "Är du säker på att du vill starta om Calibre-Web?"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1350,20 +1363,19 @@ msgstr "via"
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Alla"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "minska"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Mer av"
 
@@ -1395,17 +1407,17 @@ msgstr "Konvertera till:"
 msgid "Convert book"
 msgstr "Konvertera boken"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Boktitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Författare"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -1413,15 +1425,15 @@ msgstr "Beskrivning"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1429,7 +1441,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Taggar"
 
@@ -1453,9 +1465,9 @@ msgstr "Ladda upp omslag från lokal enhet"
 msgid "Published Date"
 msgstr "Publiceringsdatum"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Förlag"
 
@@ -1464,11 +1476,11 @@ msgstr "Förlag"
 msgid "Language"
 msgstr "Språk"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nej"
 
@@ -1480,7 +1492,7 @@ msgstr "Ladda upp format"
 msgid "View Book on Save"
 msgstr "Visa bok vid Spara"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
@@ -1490,60 +1502,133 @@ msgstr "Hämta metadata"
 msgid "Save"
 msgstr "Spara"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Är du verkligen säker?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Boken kommer att tas bort från Calibre-databasen"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "och från hårddisken"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Sökord"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Sök sökord "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Klicka på omslaget för att läsa in metadata till formuläret"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Stäng"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Källa"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Sökningsfel!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Inga resultat hittades! Försök med ett annat sökord."
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Är du verkligen säker?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Bibliotekets konfiguration"
@@ -1833,10 +1918,6 @@ msgstr "Logga in"
 msgid "View Configuration"
 msgstr "Visa konfiguration"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Antal slumpmässiga böcker att visa"
@@ -1845,7 +1926,7 @@ msgstr "Antal slumpmässiga böcker att visa"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Antal författare att visa innan de döljs (0 = inaktivera dölja)"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Tema"
 
@@ -1979,7 +2060,7 @@ msgstr "Lägg till hyllan"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2031,7 +2112,7 @@ msgstr "Nekade domäner för registrering"
 msgid "Are you sure you want to delete this domain?"
 msgstr "Är du säker på att du vill ta bort den här domänregeln?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Nästa"
 
@@ -2047,7 +2128,7 @@ msgstr "Skapa ärende"
 msgid "Return to Home"
 msgstr "Tillbaka till hemmet"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Gruppera efter serie"
 
@@ -2120,7 +2201,7 @@ msgid "Home"
 msgstr "Hem"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Tillbaka"
 
@@ -2132,12 +2213,8 @@ msgstr "Växla navigering"
 msgid "Search Library"
 msgstr "Sök i bibliotek"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Avancerad sökning"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -2153,7 +2230,7 @@ msgstr "Logga ut"
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
@@ -2165,27 +2242,23 @@ msgstr "Vänligen uppdatera inte sidan"
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Dina hyllor"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Fel"
 
@@ -2217,30 +2290,50 @@ msgstr "Strömutmatning kan inte visas"
 msgid "Show Access Log: "
 msgstr "Visa åtkomstlogg: "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "Välj tillåtna/avvisade taggar"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "Välj tillåtna/avvisade anpassade kolumnvärden"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "Välj tillåtna/avvisade användarens taggar"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "Välj tillåtna/avvisade anpassade kolumnvärden för användaren"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "Ange tagg"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "Lägg till visningsbegränsning"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Boken kommer att tas bort från Calibre-databasen"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "och från hårddisken"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-bokkatalog"
@@ -2249,99 +2342,99 @@ msgstr "Calibre-Web e-bokkatalog"
 msgid "Reflow text when sidebars are open."
 msgstr "Fyll i texten igen när sidofält är öppna."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Kortkommandon"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "Skala till bäst"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Skala till bredd"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Skala till höjd"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Skala till ursprunglig"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Vänd bilden"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Ljust"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Mörkt"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Skala"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "Bäst"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Bredd"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Höjd"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Ursprunglig"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Rotera"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Vänd"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Riktning"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Vänster till höger"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Höger till vänster"
 
@@ -2393,39 +2486,39 @@ msgstr "Sökterm:"
 msgid "Results for:"
 msgstr "Resultat för:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Publiceringsdatum från"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Publiceringsdatum till"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Uteslut taggar"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Uteslut serier"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Uteslut språk"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Tillägg"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Uteslut tillägg"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "Betyg större än"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "Betyg mindre än"
 
@@ -2441,11 +2534,11 @@ msgstr "Redigera hyllan"
 msgid "Change order"
 msgstr "Ändra ordningen"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Är du säker på att du vill ta bort hyllan?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Hylla kommer att tas bort för alla användare"
 
@@ -2561,15 +2654,11 @@ msgstr "Lägg till tillåtna/avvisade anpassade kolumnvärden"
 msgid "Delete User"
 msgstr "Ta bort den här användaren"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Senaste hämtningar"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "Skapa Kobo Auth URL"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vill du verkligen ta bort Kobo-token?"
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index f5a7d36a..2b1f3800 100644
Binary files a/cps/translations/tr/LC_MESSAGES/messages.mo and b/cps/translations/tr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 9f769ea6..57298986 100644
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -66,12 +66,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -139,15 +139,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Temel Ayarlar"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
@@ -173,121 +173,121 @@ msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "Bu e-posta adresi için bir hesap mevcut."
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Bilinmeyen bir hata oluştu."
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Deneme e-postası başarıyla %(kindlemail)s adresine gönderildi"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Deneme e-postası gönderilirken bir hata oluştu: %(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Güncelleme tamamlandı, sayfayı yenilemek için lütfen Tamam'a tıklayınız"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -299,103 +299,98 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "eKitap açılırken hata oluştu. Dosya mevcut değil veya erişilemiyor"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "metaveri düzenle"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s geçerli bir dil değil"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "'%(ext)s' uzantılı dosyaların bu sunucuya yüklenmesine izin verilmiyor"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "%(book)s kitabına %(ext)s dosya biçimi eklendi"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "eKitap düzenlenirken hata oluştu, detaylar için lütfen log dosyasını kontrol edin"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Yüklenen eKitap muhtemelen kitaplıkta zaten var. Yenisini yüklemeden değiştirmeyi düşünün: "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "Dönüştürme için kaynak ya da hedef biçimi eksik"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "eKitap %(book_format)s formatlarına dönüştürülmek üzere başarıyla sıraya alındı"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Bu eKitabı dönüştürürken bir hata oluştu: %(res)s"
@@ -408,175 +403,154 @@ msgstr "Google Drive kurulumu tamamlanmadı, Google Drive'ı devre dışı bıra
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Geri yönlendirme alanı (callback domain) doğrulanamadı, lütfen Google geliştirici konsolunda alan adını doğrulamak için gerekli adımları izleyin."
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(book)d nolu kitap için %(format)s biçimi bulunamadı"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(fn)s eKitabı için %(format)s biçimi Google Drive'da bulunamadı"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Kindle'a gönder"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s bulunamadı: %(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Kindle'a gönder"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web deneme e-Postası"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Deneme e-Postası"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Web'i Kullanmaya Başlayın"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Kullanıcı Kayıt e-Postası: %(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s biçimlerini Kindle'a gönder"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s'dan %(format)s biçimine çevir ve Kindle'a gönder"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "e-Posta: %(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "İstenilen dosya okunamadı. Yanlış izinlerden kaynaklanabilir?"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kitap adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Yazar adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Dosya adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Bekleniyor"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Başarısız"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Başladı"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Bitti"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Bilinmeyen Durum"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "e-Posta: "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "Dönüştür: "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "Yükle: "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "Bilinmeyen Görev: "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
@@ -606,7 +580,7 @@ msgstr "Google ile giriş yapılamadı."
 msgid "Failed to fetch user info from Google."
 msgstr "Google'dan kullanıcı bilgileri alınamadı."
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -711,7 +685,7 @@ msgstr "%(title)s kitaplığı oluşturuldu."
 msgid "There was an error"
 msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Kitaplık oluştur"
 
@@ -742,388 +716,426 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Yeni"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Son eKitapları göster"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Popüler"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Okunanlar"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "Okunmamışları göster"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Keşfet"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Rastgele eKitap göster"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Kategoriler"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Kategori seçimini göster"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Seriler"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Seri seçimini göster"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Yazarlar"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "Yayıncılar"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "Yayıncı seçimini göster"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Diller"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Dil seçimini göster"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "Değerlendirmeler"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "Değerlendirme seçimini göster"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "Biçimler"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "Güncelleme bilgileri okunurken beklenmeyen veri"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "Yeni güncelleme mevcut değil. Zaten en son sürüme sahipsiniz."
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdaki düğmeye tıklayın."
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "Güncelleme bilgileri alınamadı"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "Sürüm bilgisi mevcut değil"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdaki düğmeye tıklayın: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Son kararlı sürüme güncellemek için aşağıdaki düğmeye tıklayın."
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Yeni Eklenen eKitaplar"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "eKitaplar"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "Değerlendirme listesi"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "Biçim listesi"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "Görevler"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Ara"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "Yayınlanma (sonra)"
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Yayınlanma (önce)"
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Değerlendirme <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Değerlendirme >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "ara"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Gelişmiş Arama"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Ara"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "Değerlendirme listesi"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "Biçim listesi"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "Görevler"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "Yayınlanma (sonra)"
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Yayınlanma (önce)"
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Değerlendirme <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Değerlendirme >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "%(kindlemail)s'a gönderilmek üzere başarıyla sıraya alındı"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "kaydol"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "Kullanıcı adı ya da e-Posta adresi zaten kullanımda."
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "giriş"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Token bulunamadı"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Token süresi doldu"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Başarılı! Lütfen cihazınıza dönün"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Kitap Oku"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "eKitap-Dönüştürücü hatası: %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "eKitap-Dönüştürücü hatası: %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1162,7 +1174,7 @@ msgstr "Yükleme"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "İndirme"
 
@@ -1175,8 +1187,9 @@ msgid "Edit"
 msgstr "Düzenleme"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Sil"
 
@@ -1321,16 +1334,16 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr ""
 
@@ -1350,20 +1363,19 @@ msgstr "ile"
 msgid "In Library"
 msgstr "Kitaplıkta"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "Tümü"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "azalt"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "daha fazla"
 
@@ -1395,17 +1407,17 @@ msgstr "Dönüştür:"
 msgid "Convert book"
 msgstr "eKitabı dönüştür"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Kitap Adı"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Yazar"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Açıklama"
 
@@ -1413,15 +1425,15 @@ msgstr "Açıklama"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1429,7 +1441,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Etiketler"
 
@@ -1453,9 +1465,9 @@ msgstr ""
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Yayınevi"
 
@@ -1464,11 +1476,11 @@ msgstr "Yayınevi"
 msgid "Language"
 msgstr "Dil"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Evet"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Hayır"
 
@@ -1480,7 +1492,7 @@ msgstr ""
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr ""
 
@@ -1490,60 +1502,133 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "Emin misiniz?"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr ""
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr ""
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Anahtar Kelime"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr "Anahtar kelime ara"
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Forma metaveri yüklemek için kapağa tıklayın"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Kapak"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Kaynak"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Arama hatası!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Başlık"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "Emin misiniz?"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Kitaplık Ayarları"
@@ -1833,10 +1918,6 @@ msgstr "Giriş"
 msgid "View Configuration"
 msgstr "Yapılandırmayı Göster"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Başlık"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr ""
@@ -1845,7 +1926,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Tema"
 
@@ -1979,7 +2060,7 @@ msgstr "Kitaplığa ekle"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2031,7 +2112,7 @@ msgstr ""
 msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2047,7 +2128,7 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "Serilere göre grupla"
 
@@ -2120,7 +2201,7 @@ msgid "Home"
 msgstr "Anasayfa"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Geri"
 
@@ -2132,12 +2213,8 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Gelişmiş Arama"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Ayarlar"
 
@@ -2153,7 +2230,7 @@ msgstr "Çıkış"
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
@@ -2165,27 +2242,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Gözat"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Kitaplıklarınız"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Hakkında"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Önceki"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "eKitap Detayları"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "Hata"
 
@@ -2217,30 +2290,50 @@ msgstr "Akış çıktısı, görüntülenemiyor"
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2249,99 +2342,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "Kenar çubukları açıkken metni kaydır"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "En İyiye Ölçeklendir"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "Genişliğe Ölçeklendir"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "Yüksekliğe Ölçeklendir"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "Asıla göre ölçeklendir"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "Sağa çevir"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "Sola çevir"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "Resmi döndir"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "Açık"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "Koyu"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "Ölçeklendir"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "En İyi"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "Genişlik"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "Yükseklik"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "Asıl"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "Çevir"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "Döndür"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "Yatay"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "Dikey"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "Yön"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "Soldan Sağa"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "Sağdan Sola"
 
@@ -2393,39 +2486,39 @@ msgstr ""
 msgid "Results for:"
 msgstr "Sonuçlar:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr ""
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Etiketleri Hariç Tut"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Serileri Hariç Tut"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Dilleri Hariç Tut"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "Uzantılar"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "Uzantıları Hariç Tut"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2441,11 +2534,11 @@ msgstr "Kitaplığı düzenle"
 msgid "Change order"
 msgstr "Sıralamayı değiştir"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr ""
 
@@ -2561,15 +2654,11 @@ msgstr ""
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Son İndirilenler"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index e95ec263..96f2ded1 100644
Binary files a/cps/translations/uk/LC_MESSAGES/messages.mo and b/cps/translations/uk/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 1d16a600..080cf579 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "Невідомий"
@@ -65,12 +65,12 @@ msgid "Calibre-Web configuration updated"
 msgstr ""
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -138,15 +138,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr ""
 
@@ -172,121 +172,121 @@ msgstr ""
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "Сталась невідома помилка"
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -298,103 +298,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Сталась помилка при відкриванні eBook. Файл не існує або відсутній доступ до нього"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -407,173 +402,152 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "Відправити на Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Відправити на Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr ""
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:750
-msgid "Unknown Status"
-msgstr ""
-
 #: cps/helper.py:755
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
+msgid "Unknown Status"
 msgstr ""
 
 #: cps/kobo_auth.py:130
@@ -605,7 +579,7 @@ msgstr ""
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -710,7 +684,7 @@ msgstr "Створена книжкова полиця %(title)s"
 msgid "There was an error"
 msgstr "Сталась помилка"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
@@ -741,388 +715,426 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "Останні додані"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "Показувати останні книги"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "Популярні книги"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "Показувати популярні книги"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "Прочитані книги"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr ""
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "Огляд"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "Показувати випадкові книги"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "Категорії"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "Показувати вибір категорії"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "Серії"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "Показувати вибір серії"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "Автори"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr ""
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "Мови"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "Показувати вибір мови"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr ""
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr ""
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "Нещодавно додані книги"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr ""
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "Пошук"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr ""
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "Опубліковано до"
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "пошук"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "Розширений пошук"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "Пошук"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr ""
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr ""
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "Опубліковано до"
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "зареєструватись"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "увійти"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "Токен не знайдено"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Час дії токено вичерпано"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "Читати книгу"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
+msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr ""
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "Список користувачів"
@@ -1161,7 +1173,7 @@ msgstr "Додати нову книгу"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "Завантажити"
 
@@ -1174,8 +1186,9 @@ msgid "Edit"
 msgstr "Редагувати"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "Видалити"
 
@@ -1320,16 +1333,16 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr ""
 
@@ -1349,20 +1362,19 @@ msgstr "через"
 msgid "In Library"
 msgstr "У бібліотеці"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr ""
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "Більше за"
 
@@ -1394,17 +1406,17 @@ msgstr ""
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "Назва книги"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Опис"
 
@@ -1412,15 +1424,15 @@ msgstr "Опис"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1428,7 +1440,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "Теги"
 
@@ -1452,9 +1464,9 @@ msgstr ""
 msgid "Published Date"
 msgstr "Опубліковано"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Видавець"
 
@@ -1463,11 +1475,11 @@ msgstr "Видавець"
 msgid "Language"
 msgstr "Мова"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Так"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ні"
 
@@ -1479,7 +1491,7 @@ msgstr "Формат завантаження"
 msgid "View Book on Save"
 msgstr "переглянути книгу після редагування"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
@@ -1489,60 +1501,133 @@ msgstr "Отримати метадані"
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr ""
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "Книга буде видалена з БД Calibre"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "і з диску"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "Ключове слово"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " Пошук по ключовому слову"
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "Натисніть на обкладинку, щоб отримати метадані"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "Закрити"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "Джерело"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "Помилка пошуку!"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Заголовок"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr ""
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "Налаштування бібліотеки"
@@ -1832,10 +1917,6 @@ msgstr "Ім'я користувача"
 msgid "View Configuration"
 msgstr "Переглянути налаштування"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Заголовок"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "Кількість показаних випадкових книг"
@@ -1844,7 +1925,7 @@ msgstr "Кількість показаних випадкових книг"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "Тема"
 
@@ -1978,7 +2059,7 @@ msgstr "Додати на книжкову полицю"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2030,7 +2111,7 @@ msgstr ""
 msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далі"
 
@@ -2046,7 +2127,7 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr ""
 
@@ -2119,7 +2200,7 @@ msgid "Home"
 msgstr ""
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "Назад"
 
@@ -2131,12 +2212,8 @@ msgstr "Включити навігацію"
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "Розширений пошук"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -2152,7 +2229,7 @@ msgstr "Вийти"
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "Завантаження..."
 
@@ -2164,27 +2241,23 @@ msgstr ""
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "Ваші книжкові полиці"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "Деталі"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr ""
 
@@ -2216,30 +2289,50 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "Книга буде видалена з БД Calibre"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "і з диску"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2248,99 +2341,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "Переформатувати текст, коли відкриті бічні панелі."
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr ""
 
@@ -2392,39 +2485,39 @@ msgstr ""
 msgid "Results for:"
 msgstr "Результати для:"
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "Дата публікації з"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "Дата публікації до"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "Виключити теги"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "Виключити серії"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "Виключити мови"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2440,11 +2533,11 @@ msgstr ""
 msgid "Change order"
 msgstr "Змінити порядок"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "Книжкова полиця буде остаточно видалена для всіх"
 
@@ -2560,15 +2653,11 @@ msgstr ""
 msgid "Delete User"
 msgstr "Видалити цього користувача"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "Нещодавно переглянуті"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 6680683f..f78d3164 100644
Binary files a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 8d7a534f..b20addab 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_CN\n"
@@ -46,9 +46,9 @@ msgstr "重新连接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr "未知"
@@ -66,12 +66,12 @@ msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "隐藏"
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "显示"
 
@@ -121,7 +121,7 @@ msgstr "密钥文件路径无效，请输入正确的路径"
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -139,15 +139,15 @@ msgstr "数据库不可写入"
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
@@ -173,121 +173,121 @@ msgstr "管理员账户不存在，无法删除用户"
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr "此邮箱的账号已经存在。"
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "更新文件无法保存在临时目录中"
 
@@ -299,103 +299,98 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s 不是一种有效语言"
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr "移动文件失败 %(file)s：%(error)s"
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -408,175 +403,154 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "发送到Kindle"
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "此邮件已经通过Calibre-Web发送。"
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "发送到Kindle"
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "此邮件已经通过Calibre-Web发送。"
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "发送 %(format)s 到Kindle"
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到Kindle"
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "邮件：%(book)s"
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr "删除书籍 %(id)s失败，书籍路径无效：%(path)s"
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "将标题从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "将作者从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "从“%(src)s”重命名为“%(dest)s”失败，出错信息：%(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr "仅将jpg、jpeg、png、webp文件作为封面文件"
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:750
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/helper.py:755
-msgid "E-mail: "
-msgstr "邮件： "
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr "转换： "
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr "上传： "
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
-msgstr "未知任务： "
-
 #: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
@@ -606,7 +580,7 @@ msgstr "使用Google登录失败。"
 msgid "Failed to fetch user info from Google."
 msgstr "从Google获取用户信息失败。"
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -711,7 +685,7 @@ msgstr "书架 %(title)s 已创建"
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "创建书架"
 
@@ -742,388 +716,426 @@ msgstr "隐藏书籍"
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr "最近添加"
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr "显示最近书籍"
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr "热门书籍"
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr "显示热门书籍"
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr "下载历史"
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr "显示下载过的书籍"
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr "已读书籍"
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr "显示阅读状态"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr "显示未读"
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr "发现"
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr "显示随机书籍"
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr "分类"
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr "显示分类选择"
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr "丛书"
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr "显示丛书选择"
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr "作者"
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr "显示作者选择"
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr "出版社"
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr "显示出版社选择"
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr "语言"
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr "显示语言选择"
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr "评分"
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr "显示评分选择"
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr "文件格式"
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr "归档书籍"
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr "书籍列表"
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr "显示书籍列表"
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr "读取更新信息时出现意外数据"
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr "无可用更新。您已经安装了最新版本"
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "有新的更新。单击下面的按钮以更新到最新版本。"
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr "无法获取更新信息"
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr "点击下面按钮更新到最新稳定版本。"
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr "创建至少一个LDAP用户失败"
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr "用户成功导入"
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr "最近添加的书籍"
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr "书籍"
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s 下载过的书籍"
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr "评分列表"
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr "文件格式列表"
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr "任务列表"
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr "搜索"
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr "出版时间晚于 "
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr "出版时间早于 "
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "评分 <= %(rating)s"
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "评分 >= %(rating)s"
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr "搜索"
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr "高级搜索"
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr "搜索"
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr "书籍列表"
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr "评分列表"
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr "文件格式列表"
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr "任务列表"
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr "出版时间晚于 "
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr "出版时间早于 "
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "评分 <= %(rating)s"
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "评分 >= %(rating)s"
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr "这个用户名或者邮箱已被使用。"
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "电子书转换器失败： %(error)s"
+msgid "%(format)s format not found on disk"
+msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr "发生未知错误，书籍转换失败"
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "电子书转换器失败： %(error)s"
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "Calibre 运行失败，错误信息：%(error)s"
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr "用户列表"
@@ -1162,7 +1174,7 @@ msgstr "上传书籍"
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr "下载书籍"
 
@@ -1175,8 +1187,9 @@ msgid "Edit"
 msgstr "编辑书籍"
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr "删除数据"
 
@@ -1321,16 +1334,16 @@ msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr "确定"
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr "取消"
 
@@ -1350,20 +1363,19 @@ msgstr "通过"
 msgid "In Library"
 msgstr "在书库"
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr "全部"
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr "减少"
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr "更多"
 
@@ -1395,17 +1407,17 @@ msgstr "转换到："
 msgid "Convert book"
 msgstr "转换书籍"
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "简介"
 
@@ -1413,15 +1425,15 @@ msgstr "简介"
 msgid "Identifiers"
 msgstr "书号"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr "书号类型"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr "书号编号"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr "移除"
 
@@ -1429,7 +1441,7 @@ msgstr "移除"
 msgid "Add Identifier"
 msgstr "添加书号"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr "标签"
 
@@ -1453,9 +1465,9 @@ msgstr "从本地磁盘上传封面"
 msgid "Published Date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "出版社"
 
@@ -1464,11 +1476,11 @@ msgstr "出版社"
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr "没有"
 
@@ -1480,7 +1492,7 @@ msgstr "上传格式"
 msgid "View Book on Save"
 msgstr "查看保存书籍"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr "获取元数据"
 
@@ -1490,60 +1502,133 @@ msgstr "获取元数据"
 msgid "Save"
 msgstr "保存"
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr "您真的确认？"
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr "此书籍将从数据库中永久删除"
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr "，包括从硬盘中"
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Kobo 重要说明：被删除的书籍将保留在任何配对的 Kobo 设备上。"
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "必须先将书籍存档并同步设备，然后才能安全地删除书籍。"
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr " 搜索关键字 "
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr "单击封面将元数据加载到表单"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr "关闭"
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr "源"
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr "搜索错误！"
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr "无搜索结果！请尝试另一个关键字。"
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr "此栏必须填写"
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr "合并选中的书籍"
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr "删除选中的书籍"
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr "自动更新书名排序"
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr "自动更新作者排序"
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr "输入书名"
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "书名"
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr "输入书名排序"
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr "书名排序"
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr "输入作者排序"
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr "作者排序"
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr "输入作者"
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr "输入分类"
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr "输入丛书"
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr "输入书名"
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr "丛书编号"
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr "输入语言"
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr "出版日期"
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr "输入出版社"
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "您真的确认？"
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr "这本书籍将被合并："
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr "合并到这本书籍："
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr "合并"
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr "书库配置"
@@ -1833,10 +1918,6 @@ msgstr "登录"
 msgid "View Configuration"
 msgstr "查看配置"
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "名称"
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr "随机书籍显示数量"
@@ -1845,7 +1926,7 @@ msgstr "随机书籍显示数量"
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "主页中书籍作者的最大显示数量（0=不隐藏）"
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr "主题"
 
@@ -1979,7 +2060,7 @@ msgstr "添加到书架"
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr "(公共)"
 
@@ -2031,7 +2112,7 @@ msgstr "禁止注册的域名（黑名单）"
 msgid "Are you sure you want to delete this domain?"
 msgstr "您确定要删除此域名吗？"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "下一个"
 
@@ -2047,7 +2128,7 @@ msgstr "创建问题"
 msgid "Return to Home"
 msgstr "回到首页"
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr "根据丛书分组"
 
@@ -2120,7 +2201,7 @@ msgid "Home"
 msgstr "首页"
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr "后退"
 
@@ -2132,12 +2213,8 @@ msgstr "切换导航"
 msgid "Search Library"
 msgstr "搜索书库"
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr "高级搜索"
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr "设置"
 
@@ -2153,7 +2230,7 @@ msgstr "注销"
 msgid "Register"
 msgstr "注册"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr "正在上传..."
 
@@ -2165,27 +2242,23 @@ msgstr "请不要刷新页面"
 msgid "Browse"
 msgstr "按条件浏览"
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr "您的书架"
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr "书籍详情"
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr "错误"
 
@@ -2217,30 +2290,50 @@ msgstr "输出流，无法显示"
 msgid "Show Access Log: "
 msgstr "显示访问日志： "
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr "选择标签值显示或隐藏书籍"
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr "选择自定义栏目值显示或隐藏本用户书籍"
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr "选择标签值显示或隐藏书籍"
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr "选择自定义栏目值显示或隐藏本用户书籍"
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr "输入标签"
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr "添加显示或隐藏书籍的值"
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "此书籍格式将从数据库中永久删除"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "此书籍将从数据库中永久删除"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "，包括从硬盘中"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Kobo 重要说明：被删除的书籍将保留在任何配对的 Kobo 设备上。"
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "必须先将书籍存档并同步设备，然后才能安全地删除书籍。"
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Caliebre-Web电子书路径"
@@ -2249,99 +2342,99 @@ msgstr "Caliebre-Web电子书路径"
 msgid "Reflow text when sidebars are open."
 msgstr "打开侧栏时重排文本。"
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr "上一页"
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr "下一页"
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr "缩放到最佳"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr "按宽度缩放"
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr "按高度缩放"
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr "缩放到原始大小"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr "向右旋转"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr "向左旋转"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr "翻转图片"
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr "浅色"
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr "深色"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr "缩放"
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr "最佳"
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr "宽度"
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr "高度"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr "原始"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr "旋转"
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr "翻转"
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr "水平"
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr "垂直"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr "方向"
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr "从左到右"
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr "从右到左"
 
@@ -2393,39 +2486,39 @@ msgstr "搜索项："
 msgid "Results for:"
 msgstr "结果："
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr "出版日期从"
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr "出版日期到"
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr "排除标签"
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr "排除丛书"
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr "排除语言"
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr "扩展名"
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr "排除扩展名"
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr "评分大于"
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr "评分小于"
 
@@ -2441,11 +2534,11 @@ msgstr "编辑书架"
 msgid "Change order"
 msgstr "修改排序"
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr "书架将会重所有用户中删除"
 
@@ -2561,15 +2654,11 @@ msgstr "添加显示或隐藏书籍的自定义栏目值"
 msgid "Delete User"
 msgstr "删除此用户"
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr "最近下载"
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr "生成Kobo Auth 地址"
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您确定删除Kobo Token吗？"
 
diff --git a/cps/web.py b/cps/web.py
index 44d011af..34cfe90b 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -41,7 +41,7 @@ from flask_login import login_user, logout_user, login_required, current_user, c
 from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
 from sqlalchemy.sql.expression import text, func, true, false, not_, and_, or_
 from sqlalchemy.orm.attributes import flag_modified
-from werkzeug.exceptions import default_exceptions, InternalServerError
+from werkzeug.exceptions import default_exceptions
 from sqlalchemy.sql.functions import coalesce
 
 from .services.worker import WorkerThread
@@ -307,6 +307,8 @@ def before_request():
 
 
 @app.route('/import_ldap_users')
+@login_required
+@admin_required
 def import_ldap_users():
     showtext = {}
     try:
@@ -624,6 +626,10 @@ def render_books_list(data, sort, book_id, page):
         order = [db.Books.timestamp.desc()]
     if sort == 'old':
         order = [db.Books.timestamp]
+    if sort == 'authaz':
+        order = [db.Books.author_sort.asc()]
+    if sort == 'authza':
+        order = [db.Books.author_sort.desc()]
 
     if data == "rated":
         if current_user.check_visibility(constants.SIDEBAR_BEST_RATED):
@@ -951,7 +957,7 @@ def render_prepare_search_form(cc):
     else:
         languages = None
     return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
-                                 series=series, title=_(u"search"), cc=cc, page="advsearch")
+                                 series=series, title=_(u"Advanced Search"), cc=cc, page="advsearch")
 
 
 def render_search_results(term, offset=None, order=None, limit=None):
@@ -1227,7 +1233,9 @@ def reconnect():
 def search():
     term = request.args.get("query")
     if term:
-        return render_search_results(term, 0, None, config.config_books_per_page)
+        # flask_session['query'] = json.dumps(request.form)
+        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term))
+        # return render_search_results(term, 0, None, config.config_books_per_page)
     else:
         return render_title_template('search.html',
                                      searchterm="",
@@ -1236,11 +1244,17 @@ def search():
                                      page="search")
 
 
-@web.route("/advanced_search", methods=['POST'])
+@web.route("/advsearch", methods=['POST'])
 @login_required_if_no_ano
 def advanced_search():
-    term = request.form
-    return render_adv_search_results(term, 0, None, config.config_books_per_page)
+    values = dict(request.form)
+    params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_language',
+              'exclude_language', 'include_extension', 'exclude_extension']
+    for param in params:
+        values[param] = list(request.form.getlist(param))
+    flask_session['query'] = json.dumps(values)
+    return redirect(url_for('web.books_list', data="advsearch", sort_param='stored', query=""))
+
 
 def render_adv_search_results(term, offset=None, order=None, limit=None):
     order = order or [db.Books.sort]
@@ -1250,14 +1264,14 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
     q = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(True))
 
-    include_tag_inputs = request.form.getlist('include_tag')
-    exclude_tag_inputs = request.form.getlist('exclude_tag')
-    include_series_inputs = request.form.getlist('include_serie')
-    exclude_series_inputs = request.form.getlist('exclude_serie')
-    include_languages_inputs = request.form.getlist('include_language')
-    exclude_languages_inputs = request.form.getlist('exclude_language')
-    include_extension_inputs = request.form.getlist('include_extension')
-    exclude_extension_inputs = request.form.getlist('exclude_extension')
+    include_tag_inputs = term.get('include_tag')
+    exclude_tag_inputs = term.get('exclude_tag')
+    include_series_inputs = term.get('include_serie')
+    exclude_series_inputs = term.get('exclude_serie')
+    include_languages_inputs = term.get('include_language')
+    exclude_languages_inputs = term.get('exclude_language')
+    include_extension_inputs = term.get('include_extension')
+    exclude_extension_inputs = term.get('exclude_extension')
 
     author_name = term.get("author_name")
     book_title = term.get("book_title")
@@ -1277,15 +1291,14 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     searchterm = []
     cc_present = False
     for c in cc:
-        if request.form.get('custom_column_' + str(c.id)):
-            searchterm.extend([(u"%s: %s" % (c.name, request.form.get('custom_column_' + str(c.id))))])
+        if term.get('custom_column_' + str(c.id)):
+            searchterm.extend([(u"%s: %s" % (c.name, term.get('custom_column_' + str(c.id))))])
             cc_present = True
 
     if include_tag_inputs or exclude_tag_inputs or include_series_inputs or exclude_series_inputs or \
-        include_languages_inputs or exclude_languages_inputs or author_name or book_title or \
-        publisher or pub_start or pub_end or rating_low or rating_high or description or cc_present or \
-        include_extension_inputs or exclude_extension_inputs:
-        searchterm = []
+            include_languages_inputs or exclude_languages_inputs or author_name or book_title or \
+            publisher or pub_start or pub_end or rating_low or rating_high or description or cc_present or \
+            include_extension_inputs or exclude_extension_inputs:
         searchterm.extend((author_name.replace('|', ','), book_title, publisher))
         if pub_start:
             try:
@@ -1305,7 +1318,8 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         searchterm.extend(tag.name for tag in tag_names)
         serie_names = calibre_db.session.query(db.Series).filter(db.Series.id.in_(include_series_inputs)).all()
         searchterm.extend(serie.name for serie in serie_names)
-        language_names = calibre_db.session.query(db.Languages).filter(db.Languages.id.in_(include_languages_inputs)).all()
+        language_names = calibre_db.session.query(db.Languages).\
+            filter(db.Languages.id.in_(include_languages_inputs)).all()
         if language_names:
             language_names = calibre_db.speaking_language(language_names)
         searchterm.extend(language.name for language in language_names)
@@ -1316,9 +1330,9 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         searchterm.extend(ext for ext in include_extension_inputs)
         searchterm.extend(ext for ext in exclude_extension_inputs)
         # handle custom columns
-        for c in cc:
-            if request.form.get('custom_column_' + str(c.id)):
-                searchterm.extend([(u"%s: %s" % (c.name, request.form.get('custom_column_' + str(c.id))))])
+        #for c in cc:
+        #    if term.get('custom_column_' + str(c.id)):
+        #        searchterm.extend([(u"%s: %s" % (c.name, term.get('custom_column_' + str(c.id))))])
         searchterm = " + ".join(filter(None, searchterm))
         q = q.filter()
         if author_name:
@@ -1361,7 +1375,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 
         # search custom culumns
         for c in cc:
-            custom_query = request.form.get('custom_column_' + str(c.id))
+            custom_query = term.get('custom_column_' + str(c.id))
             if custom_query != '' and custom_query is not None:
                 if c.datatype == 'bool':
                     q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
@@ -1375,28 +1389,28 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
                 else:
                     q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
                         func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%")))
-        q = q.order_by(*order).all()
-        flask_session['query'] = json.dumps(term)
-        ub.store_ids(q)
-        # entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
-        result_count = len(q)
-        if offset != None and limit != None:
-            offset = int(offset)
-            limit_all = offset + int(limit)
-            pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
-        else:
-            offset = 0
-            limit_all = result_count
+    q = q.order_by(*order).all()
+    flask_session['query'] = json.dumps(term)
+    ub.store_ids(q)
+    # entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
+    result_count = len(q)
+    if offset != None and limit != None:
+        offset = int(offset)
+        limit_all = offset + int(limit)
+        pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
+    else:
+        offset = 0
+        limit_all = result_count
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
                                  entries=q[offset:limit_all],
                                  result_count=result_count,
-                                 title=_(u"search"), page="advsearch")
+                                 title=_(u"Advanced Search"), page="advsearch")
 
 
 
-@web.route("/advanced_search", methods=['GET'])
+@web.route("/advsearch", methods=['GET'])
 @login_required_if_no_ano
 def advanced_search_form():
     # Build custom columns names
diff --git a/messages.pot b/messages.pot
index 4e429813..e8205c05 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-10-06 21:47+0200\n"
+"POT-Creation-Date: 2020-10-31 19:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:116 cps/editbooks.py:575 cps/editbooks.py:587
-#: cps/editbooks.py:687 cps/editbooks.py:689 cps/editbooks.py:750
-#: cps/editbooks.py:766 cps/updater.py:509 cps/uploader.py:98
+#: cps/admin.py:116 cps/editbooks.py:612 cps/editbooks.py:624
+#: cps/editbooks.py:724 cps/editbooks.py:726 cps/editbooks.py:787
+#: cps/editbooks.py:803 cps/updater.py:510 cps/uploader.py:98
 #: cps/uploader.py:108
 msgid "Unknown"
 msgstr ""
@@ -65,12 +65,12 @@ msgid "Calibre-Web configuration updated"
 msgstr ""
 
 #: cps/admin.py:435 cps/admin.py:441 cps/admin.py:452 cps/admin.py:463
-#: cps/templates/modal_restriction.html:29
+#: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
 #: cps/admin.py:437 cps/admin.py:443 cps/admin.py:454 cps/admin.py:465
-#: cps/templates/modal_restriction.html:28
+#: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:891 cps/admin.py:940
+#: cps/admin.py:700 cps/admin.py:799 cps/admin.py:889 cps/admin.py:938
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
@@ -138,15 +138,15 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:762 cps/web.py:1338
+#: cps/admin.py:762 cps/web.py:1505
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:909
+#: cps/admin.py:765 cps/admin.py:777 cps/admin.py:783 cps/admin.py:907
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:774 cps/web.py:1581
+#: cps/admin.py:774 cps/web.py:1751
 msgid "E-mail is not from valid domain"
 msgstr ""
 
@@ -172,121 +172,121 @@ msgstr ""
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:853 cps/web.py:1624
+#: cps/admin.py:853 cps/web.py:1793
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:863 cps/admin.py:878 cps/admin.py:989 cps/web.py:1599
+#: cps/admin.py:862 cps/admin.py:876 cps/admin.py:979 cps/web.py:1769
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:869 cps/web.py:1591
+#: cps/admin.py:868 cps/web.py:1762
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:885
+#: cps/admin.py:883
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:888
+#: cps/admin.py:886
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/admin.py:918 cps/templates/admin.html:71
+#: cps/admin.py:916 cps/templates/admin.html:71
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:945
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:950
+#: cps/admin.py:948
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:952
+#: cps/admin.py:950
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:954
+#: cps/admin.py:952
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:965
+#: cps/admin.py:963
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1000
+#: cps/admin.py:990
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1003 cps/web.py:1362 cps/web.py:1426
+#: cps/admin.py:993 cps/web.py:1529 cps/web.py:1593
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1006 cps/web.py:1300
+#: cps/admin.py:996 cps/web.py:1467
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1008
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1057
+#: cps/admin.py:1047
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1058
+#: cps/admin.py:1048
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1059
+#: cps/admin.py:1049
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1050
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1061
+#: cps/admin.py:1051
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1062
+#: cps/admin.py:1052
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1063
+#: cps/admin.py:1053
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1064 cps/admin.py:1065 cps/admin.py:1066 cps/admin.py:1067
-#: cps/admin.py:1068
+#: cps/admin.py:1054 cps/admin.py:1055 cps/admin.py:1056 cps/admin.py:1057
+#: cps/admin.py:1058
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1064 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1054 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1065 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1055 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1066 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1056 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1067 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1057 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1068
+#: cps/admin.py:1058
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -298,103 +298,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:245
+#: cps/editbooks.py:273 cps/editbooks.py:275
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:248
+#: cps/editbooks.py:282 cps/editbooks.py:284
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:257 cps/editbooks.py:560 cps/web.py:1647 cps/web.py:1688
-#: cps/web.py:1750
+#: cps/editbooks.py:293 cps/editbooks.py:596 cps/web.py:1824 cps/web.py:1865
+#: cps/web.py:1927
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:291
+#: cps/editbooks.py:327
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:366
+#: cps/editbooks.py:402
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:477 cps/editbooks.py:732
+#: cps/editbooks.py:513 cps/editbooks.py:769
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:481 cps/editbooks.py:736
+#: cps/editbooks.py:517 cps/editbooks.py:773
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:493 cps/editbooks.py:796
+#: cps/editbooks.py:529
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:498
+#: cps/editbooks.py:534
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:516 cps/editbooks.py:887
+#: cps/editbooks.py:552 cps/editbooks.py:904
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:520
+#: cps/editbooks.py:556
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:636
+#: cps/editbooks.py:673
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:673
+#: cps/editbooks.py:710
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:682
+#: cps/editbooks.py:719
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:744
+#: cps/editbooks.py:781
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:754
+#: cps/editbooks.py:791
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:803
-#, python-format
-msgid "Failed to Move File %(file)s: %(error)s"
-msgstr ""
-
-#: cps/editbooks.py:859
+#: cps/editbooks.py:879
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:873
+#: cps/editbooks.py:890
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:916
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:907
+#: cps/editbooks.py:924
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:911
+#: cps/editbooks.py:928
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -407,173 +402,152 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:77
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:89
+#: cps/helper.py:85 cps/tasks/convert.py:50
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:224 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr ""
-
-#: cps/helper.py:97 cps/helper.py:115 cps/helper.py:226
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:108
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:95 cps/helper.py:228 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr ""
+
+#: cps/helper.py:96 cps/helper.py:112 cps/helper.py:230
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:149 cps/helper.py:153 cps/helper.py:157 cps/helper.py:166
-#: cps/helper.py:170 cps/helper.py:174
+#: cps/helper.py:153 cps/helper.py:157 cps/helper.py:161 cps/helper.py:170
+#: cps/helper.py:174 cps/helper.py:178
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:179 cps/helper.py:185
+#: cps/helper.py:183 cps/helper.py:189
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:226
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr ""
 
-#: cps/helper.py:228
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:325
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:331
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:376
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:386
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:402
+#: cps/helper.py:415
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:440 cps/helper.py:450 cps/helper.py:458
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:576
+#: cps/helper.py:588
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:579
+#: cps/helper.py:591
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:606
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:599
+#: cps/helper.py:611
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:622
 msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:624
+#: cps/helper.py:636
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:672
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:686
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:742
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:744
+#: cps/helper.py:749
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:746
+#: cps/helper.py:751
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:748
+#: cps/helper.py:753
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:750
-msgid "Unknown Status"
-msgstr ""
-
 #: cps/helper.py:755
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:757 cps/helper.py:761
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:759
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Unknown Task: "
+msgid "Unknown Status"
 msgstr ""
 
 #: cps/kobo_auth.py:130
@@ -605,7 +579,7 @@ msgstr ""
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1398 cps/web.py:1540
+#: cps/oauth_bb.py:225 cps/web.py:1565 cps/web.py:1707
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -710,7 +684,7 @@ msgstr ""
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:144
+#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr ""
 
@@ -741,388 +715,426 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/ub.py:65
+#: cps/ub.py:68
 msgid "Recently Added"
 msgstr ""
 
-#: cps/ub.py:67
+#: cps/ub.py:70
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/index.xml:17 cps/ub.py:68
+#: cps/templates/index.xml:17 cps/ub.py:71
 msgid "Hot Books"
 msgstr ""
 
-#: cps/ub.py:70
+#: cps/ub.py:73
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/templates/index.xml:24 cps/ub.py:72 cps/web.py:653
+#: cps/ub.py:74
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/ub.py:76
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:639
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/ub.py:74
+#: cps/ub.py:81
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:75
-#: cps/web.py:1220
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:82
+#: cps/web.py:900
 msgid "Read Books"
 msgstr ""
 
-#: cps/ub.py:77
+#: cps/ub.py:84
 msgid "Show read and unread"
 msgstr ""
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:79
-#: cps/web.py:1223
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:86
+#: cps/web.py:903
 msgid "Unread Books"
 msgstr ""
 
-#: cps/ub.py:81
+#: cps/ub.py:88
 msgid "Show unread"
 msgstr ""
 
-#: cps/ub.py:82
+#: cps/ub.py:89
 msgid "Discover"
 msgstr ""
 
-#: cps/ub.py:84
+#: cps/ub.py:91
 msgid "Show random books"
 msgstr ""
 
-#: cps/templates/index.xml:75 cps/ub.py:85 cps/web.py:968
+#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
+#: cps/web.py:1204
 msgid "Categories"
 msgstr ""
 
-#: cps/ub.py:87
+#: cps/ub.py:94
 msgid "Show category selection"
 msgstr ""
 
-#: cps/templates/book_edit.html:84 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:88 cps/web.py:884 cps/web.py:894
+#: cps/templates/book_edit.html:84 cps/templates/book_table.html:51
+#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
+#: cps/web.py:1108 cps/web.py:1118
 msgid "Series"
 msgstr ""
 
-#: cps/ub.py:90
+#: cps/ub.py:97
 msgid "Show series selection"
 msgstr ""
 
-#: cps/templates/index.xml:61 cps/ub.py:91
+#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
 msgid "Authors"
 msgstr ""
 
-#: cps/ub.py:93
+#: cps/ub.py:100
 msgid "Show author selection"
 msgstr ""
 
-#: cps/templates/index.xml:68 cps/ub.py:95 cps/web.py:867
+#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
+#: cps/web.py:1087
 msgid "Publishers"
 msgstr ""
 
-#: cps/ub.py:97
+#: cps/ub.py:104
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:98
-#: cps/web.py:951
+#: cps/templates/book_table.html:53 cps/templates/index.xml:89
+#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1183
 msgid "Languages"
 msgstr ""
 
-#: cps/ub.py:101
+#: cps/ub.py:108
 msgid "Show language selection"
 msgstr ""
 
-#: cps/templates/index.xml:96 cps/ub.py:102
+#: cps/templates/index.xml:96 cps/ub.py:109
 msgid "Ratings"
 msgstr ""
 
-#: cps/ub.py:104
+#: cps/ub.py:111
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/templates/index.xml:104 cps/ub.py:105
+#: cps/templates/index.xml:104 cps/ub.py:112
 msgid "File formats"
 msgstr ""
 
-#: cps/ub.py:107
+#: cps/ub.py:114
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/ub.py:109 cps/web.py:1247
+#: cps/ub.py:116 cps/web.py:927
 msgid "Archived Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:118
 msgid "Show archived books"
 msgstr ""
 
-#: cps/updater.py:294 cps/updater.py:305 cps/updater.py:406 cps/updater.py:420
+#: cps/ub.py:120
+msgid "Books List"
+msgstr ""
+
+#: cps/ub.py:122
+msgid "Show Books List"
+msgstr ""
+
+#: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:301 cps/updater.py:412
+#: cps/updater.py:302 cps/updater.py:413
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:333
+#: cps/updater.py:334
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:385
+#: cps/updater.py:386
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:399
+#: cps/updater.py:400
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:456 cps/updater.py:467 cps/updater.py:486
+#: cps/updater.py:457 cps/updater.py:468 cps/updater.py:487
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:477
+#: cps/updater.py:478
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:320
+#: cps/web.py:316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/web.py:324
+#: cps/web.py:320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/web.py:372
+#: cps/web.py:368
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/web.py:375
+#: cps/web.py:371
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/web.py:377
+#: cps/web.py:373
 msgid "User Successfully Imported"
 msgstr ""
 
-#: cps/web.py:623
-msgid "Recently Added Books"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:661
+#: cps/templates/index.html:5 cps/web.py:647
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:689
+#: cps/web.py:686
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:716
+#: cps/web.py:713
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:729
+#: cps/web.py:748
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr ""
+
+#: cps/web.py:762
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:743
+#: cps/web.py:776
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:790
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:770
+#: cps/web.py:803
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:783
+#: cps/web.py:816
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:796
+#: cps/web.py:829
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:810
+#: cps/web.py:843
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/web.py:908
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:923
-msgid "File formats list"
-msgstr ""
-
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:982
-msgid "Tasks"
-msgstr ""
-
-#: cps/templates/book_edit.html:240 cps/templates/feed.xml:33
-#: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:174 cps/web.py:1008 cps/web.py:1013
-msgid "Search"
-msgstr ""
-
-#: cps/web.py:1064
-msgid "Published after "
-msgstr ""
-
-#: cps/web.py:1071
-msgid "Published before "
-msgstr ""
-
-#: cps/web.py:1085
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1087
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1156 cps/web.py:1181
-msgid "search"
-msgstr ""
-
-#: cps/web.py:1211
+#: cps/web.py:891
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/web.py:1305
+#: cps/templates/layout.html:56 cps/web.py:958 cps/web.py:1407
+msgid "Advanced Search"
+msgstr ""
+
+#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/layout.html:45 cps/templates/layout.html:48
+#: cps/templates/search_form.html:175 cps/web.py:970 cps/web.py:1241
+msgid "Search"
+msgstr ""
+
+#: cps/web.py:998
+msgid "Books list"
+msgstr ""
+
+#: cps/web.py:1136
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:1155
+msgid "File formats list"
+msgstr ""
+
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1218
+msgid "Tasks"
+msgstr ""
+
+#: cps/web.py:1303
+msgid "Published after "
+msgstr ""
+
+#: cps/web.py:1310
+msgid "Published before "
+msgstr ""
+
+#: cps/web.py:1325
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1327
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr ""
+
+#: cps/web.py:1472
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1309
+#: cps/web.py:1476
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1311
+#: cps/web.py:1478
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1328
+#: cps/web.py:1495
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1329 cps/web.py:1339 cps/web.py:1363 cps/web.py:1367
-#: cps/web.py:1372 cps/web.py:1376
+#: cps/web.py:1496 cps/web.py:1506 cps/web.py:1530 cps/web.py:1534
+#: cps/web.py:1539 cps/web.py:1543
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1365
+#: cps/web.py:1532
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1368
+#: cps/web.py:1535
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1538
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1388
+#: cps/web.py:1555
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1405
+#: cps/web.py:1572
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1411
+#: cps/web.py:1578
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1415 cps/web.py:1439
+#: cps/web.py:1582 cps/web.py:1606
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1422
+#: cps/web.py:1589
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1428
+#: cps/web.py:1595
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1434
+#: cps/web.py:1601
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1445 cps/web.py:1472
+#: cps/web.py:1612 cps/web.py:1639
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1484 cps/web.py:1518
+#: cps/web.py:1651 cps/web.py:1685
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:1493 cps/web.py:1526
+#: cps/web.py:1660 cps/web.py:1693
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:1502
+#: cps/web.py:1669
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:1583 cps/web.py:1628 cps/web.py:1634
+#: cps/web.py:1753 cps/web.py:1809
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1630
+#: cps/web.py:1789
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1659 cps/web.py:1662 cps/web.py:1665 cps/web.py:1672
-#: cps/web.py:1677
+#: cps/web.py:1836 cps/web.py:1839 cps/web.py:1842 cps/web.py:1849
+#: cps/web.py:1854
 msgid "Read a Book"
 msgstr ""
 
-#: cps/worker.py:314
+#: cps/tasks/convert.py:103
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/worker.py:374
+#: cps/tasks/convert.py:127
 #, python-format
-msgid "Ebook-converter failed: %(error)s"
+msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/worker.py:407
+#: cps/tasks/convert.py:130
+msgid "Ebook converter failed with unknown error"
+msgstr ""
+
+#: cps/tasks/convert.py:140
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:431
+#: cps/tasks/convert.py:164
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
+#: cps/tasks/convert.py:187
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr ""
+
+#: cps/tasks/convert.py:212
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr ""
+
 #: cps/templates/admin.html:9
 msgid "Users"
 msgstr ""
@@ -1161,7 +1173,7 @@ msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/detail.html:18
 #: cps/templates/detail.html:27 cps/templates/shelf.html:6
-#: cps/templates/shelfdown.html:62
+#: cps/templates/shelfdown.html:70
 msgid "Download"
 msgstr ""
 
@@ -1174,8 +1186,9 @@ msgid "Edit"
 msgstr ""
 
 #: cps/templates/admin.html:22 cps/templates/book_edit.html:16
-#: cps/templates/book_edit.html:221 cps/templates/email_edit.html:100
-#: cps/templates/user_edit.html:66 cps/templates/user_edit.html:179
+#: cps/templates/book_table.html:57 cps/templates/email_edit.html:100
+#: cps/templates/modal_dialogs.html:63 cps/templates/user_edit.html:66
+#: cps/templates/user_edit.html:167
 msgid "Delete"
 msgstr ""
 
@@ -1320,16 +1333,16 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:182 cps/templates/admin.html:196
-#: cps/templates/admin.html:216 cps/templates/shelf.html:72
+#: cps/templates/admin.html:216 cps/templates/shelf.html:80
 msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:183 cps/templates/admin.html:197
-#: cps/templates/book_edit.html:192 cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
 #: cps/templates/config_edit.html:391 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:47 cps/templates/email_edit.html:101
-#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
-#: cps/templates/user_edit.html:139
+#: cps/templates/modal_dialogs.html:64 cps/templates/shelf.html:81
+#: cps/templates/shelf_edit.html:19 cps/templates/user_edit.html:139
 msgid "Cancel"
 msgstr ""
 
@@ -1349,20 +1362,19 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:34 cps/templates/book_table.html:14
-#: cps/templates/grid.html:14 cps/templates/list.html:14
-#: cps/templates/search.html:38
+#: cps/templates/author.html:34 cps/templates/grid.html:14
+#: cps/templates/list.html:14
 msgid "All"
 msgstr ""
 
-#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/author.html:58 cps/templates/author.html:118
 #: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:89 cps/templates/search.html:64
+#: cps/templates/index.html:97 cps/templates/search.html:60
 #: cps/templates/shelf.html:36
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:94
+#: cps/templates/author.html:102
 msgid "More by"
 msgstr ""
 
@@ -1394,17 +1406,17 @@ msgstr ""
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:7
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:284
-#: cps/templates/book_edit.html:302 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
 msgid "Author"
 msgstr ""
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:289
-#: cps/templates/book_edit.html:304 cps/templates/search_form.html:126
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
 msgid "Description"
 msgstr ""
 
@@ -1412,15 +1424,15 @@ msgstr ""
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:313
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:314
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:315
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
 msgid "Remove"
 msgstr ""
 
@@ -1428,7 +1440,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
 msgid "Tags"
 msgstr ""
 
@@ -1452,9 +1464,9 @@ msgstr ""
 msgid "Published Date"
 msgstr ""
 
-#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:286
-#: cps/templates/book_edit.html:303 cps/templates/detail.html:156
-#: cps/templates/search_form.html:14
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr ""
 
@@ -1463,11 +1475,11 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:137
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
 msgid "No"
 msgstr ""
 
@@ -1479,7 +1491,7 @@ msgstr ""
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:234
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
 msgid "Fetch Metadata"
 msgstr ""
 
@@ -1489,60 +1501,133 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:205
-msgid "Are you really sure?"
-msgstr ""
-
-#: cps/templates/book_edit.html:209
-msgid "This book will be permanently erased from database"
-msgstr ""
-
 #: cps/templates/book_edit.html:210
-msgid "and hard disk"
-msgstr ""
-
-#: cps/templates/book_edit.html:214
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr ""
-
-#: cps/templates/book_edit.html:215
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr ""
-
-#: cps/templates/book_edit.html:237
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:238
+#: cps/templates/book_edit.html:211
 msgid " Search keyword "
 msgstr ""
 
-#: cps/templates/book_edit.html:244
+#: cps/templates/book_edit.html:217
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:299
+#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:264 cps/templates/layout.html:190
-#: cps/templates/layout.html:222 cps/templates/modal_restriction.html:34
-#: cps/templates/user_edit.html:166
+#: cps/templates/book_edit.html:237 cps/templates/layout.html:186
+#: cps/templates/layout.html:217 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:154
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:291 cps/templates/book_edit.html:305
+#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:300
+#: cps/templates/book_edit.html:273
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:301
+#: cps/templates/book_edit.html:274
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
+#: cps/templates/book_table.html:10 cps/templates/book_table.html:52
+msgid "This Field is Required"
+msgstr ""
+
+#: cps/templates/book_table.html:23
+msgid "Merge selected books"
+msgstr ""
+
+#: cps/templates/book_table.html:24
+msgid "Remove Selections"
+msgstr ""
+
+#: cps/templates/book_table.html:30
+msgid "Update Title Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:34
+msgid "Update Author Sort automatically"
+msgstr ""
+
+#: cps/templates/book_table.html:46
+msgid "Enter Title"
+msgstr ""
+
+#: cps/templates/book_table.html:46 cps/templates/config_view_edit.html:23
+#: cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Enter Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:47
+msgid "Title Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Enter Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:48
+msgid "Author Sort"
+msgstr ""
+
+#: cps/templates/book_table.html:49
+msgid "Enter Authors"
+msgstr ""
+
+#: cps/templates/book_table.html:50
+msgid "Enter Categories"
+msgstr ""
+
+#: cps/templates/book_table.html:51
+msgid "Enter Series"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Enter title"
+msgstr ""
+
+#: cps/templates/book_table.html:52
+msgid "Series Index"
+msgstr ""
+
+#: cps/templates/book_table.html:53
+msgid "Enter Languages"
+msgstr ""
+
+#: cps/templates/book_table.html:54
+msgid "Publishing Date"
+msgstr ""
+
+#: cps/templates/book_table.html:55
+msgid "Enter Publishers"
+msgstr ""
+
+#: cps/templates/book_table.html:70 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr ""
+
+#: cps/templates/book_table.html:74
+msgid "Books with Title will be merged from:"
+msgstr ""
+
+#: cps/templates/book_table.html:78
+msgid "Into Book with Title:"
+msgstr ""
+
+#: cps/templates/book_table.html:83
+msgid "Merge"
+msgstr ""
+
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
 msgstr ""
@@ -1832,10 +1917,6 @@ msgstr ""
 msgid "View Configuration"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr ""
-
 #: cps/templates/config_view_edit.html:31
 msgid "No. of Random Books to Display"
 msgstr ""
@@ -1844,7 +1925,7 @@ msgstr ""
 msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:117
 msgid "Theme"
 msgstr ""
 
@@ -1978,7 +2059,7 @@ msgstr ""
 
 #: cps/templates/detail.html:253 cps/templates/detail.html:270
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/layout.html:141 cps/templates/search.html:20
+#: cps/templates/search.html:20
 msgid "(Public)"
 msgstr ""
 
@@ -2030,7 +2111,7 @@ msgstr ""
 msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:174
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr ""
 
@@ -2046,7 +2127,7 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:64
+#: cps/templates/index.html:72
 msgid "Group by series"
 msgstr ""
 
@@ -2119,7 +2200,7 @@ msgid "Home"
 msgstr ""
 
 #: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:180
+#: cps/templates/user_edit.html:168
 msgid "Back"
 msgstr ""
 
@@ -2131,12 +2212,8 @@ msgstr ""
 msgid "Search Library"
 msgstr ""
 
-#: cps/templates/layout.html:56
-msgid "Advanced Search"
-msgstr ""
-
 #: cps/templates/layout.html:77 cps/templates/read.html:71
-#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+#: cps/templates/readcbr.html:88 cps/templates/readcbr.html:112
 msgid "Settings"
 msgstr ""
 
@@ -2152,7 +2229,7 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:221
+#: cps/templates/layout.html:117 cps/templates/layout.html:216
 msgid "Uploading..."
 msgstr ""
 
@@ -2164,27 +2241,23 @@ msgstr ""
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:139
-msgid "Your Shelves"
-msgstr ""
-
-#: cps/templates/layout.html:145 cps/templates/stats.html:3
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:159
+#: cps/templates/layout.html:155
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:186
+#: cps/templates/layout.html:182
 msgid "Book Details"
 msgstr ""
 
-#: cps/templates/layout.html:220
+#: cps/templates/layout.html:215
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:223
+#: cps/templates/layout.html:218
 msgid "Error"
 msgstr ""
 
@@ -2216,30 +2289,50 @@ msgstr ""
 msgid "Show Access Log: "
 msgstr ""
 
-#: cps/templates/modal_restriction.html:6
+#: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:7
+#: cps/templates/modal_dialogs.html:7
 msgid "Select Allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:8
+#: cps/templates/modal_dialogs.html:8
 msgid "Select Allowed/Denied Tags of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:9
+#: cps/templates/modal_dialogs.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:15
+#: cps/templates/modal_dialogs.html:15
 msgid "Enter Tag"
 msgstr ""
 
-#: cps/templates/modal_restriction.html:24
+#: cps/templates/modal_dialogs.html:24
 msgid "Add View Restriction"
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2248,99 +2341,99 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:93
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:96
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:97
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:98
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:99
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:100
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:96
+#: cps/templates/readcbr.html:101
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:102
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:103
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:104
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:115
+#: cps/templates/readcbr.html:120
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:116
+#: cps/templates/readcbr.html:121
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:126
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:124
+#: cps/templates/readcbr.html:129
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:125
+#: cps/templates/readcbr.html:130
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:126
+#: cps/templates/readcbr.html:131
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:132
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:137
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:148
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:146
+#: cps/templates/readcbr.html:151
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:147
+#: cps/templates/readcbr.html:152
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:157
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:155
+#: cps/templates/readcbr.html:160
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:156
+#: cps/templates/readcbr.html:161
 msgid "Right to Left"
 msgstr ""
 
@@ -2392,39 +2485,39 @@ msgstr ""
 msgid "Results for:"
 msgstr ""
 
-#: cps/templates/search_form.html:19
+#: cps/templates/search_form.html:20
 msgid "Published Date From"
 msgstr ""
 
-#: cps/templates/search_form.html:26
+#: cps/templates/search_form.html:27
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:43
+#: cps/templates/search_form.html:44
 msgid "Exclude Tags"
 msgstr ""
 
-#: cps/templates/search_form.html:63
+#: cps/templates/search_form.html:64
 msgid "Exclude Series"
 msgstr ""
 
-#: cps/templates/search_form.html:84
+#: cps/templates/search_form.html:85
 msgid "Exclude Languages"
 msgstr ""
 
-#: cps/templates/search_form.html:95
+#: cps/templates/search_form.html:96
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:105
+#: cps/templates/search_form.html:106
 msgid "Exclude Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:117
+#: cps/templates/search_form.html:118
 msgid "Rating Above"
 msgstr ""
 
-#: cps/templates/search_form.html:121
+#: cps/templates/search_form.html:122
 msgid "Rating Below"
 msgstr ""
 
@@ -2440,11 +2533,11 @@ msgstr ""
 msgid "Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:67
+#: cps/templates/shelf.html:75
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/templates/shelf.html:70
+#: cps/templates/shelf.html:78
 msgid "Shelf will be deleted for all users"
 msgstr ""
 
@@ -2560,15 +2653,11 @@ msgstr ""
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:146
-msgid "Recent Downloads"
-msgstr ""
-
-#: cps/templates/user_edit.html:162
+#: cps/templates/user_edit.html:150
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:178
+#: cps/templates/user_edit.html:166
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
diff --git a/test/Calibre-Web TestSummary_Windows.html b/test/Calibre-Web TestSummary_Windows.html
index 4e822ce9..aa7931f2 100644
--- a/test/Calibre-Web TestSummary_Windows.html	
+++ b/test/Calibre-Web TestSummary_Windows.html	
@@ -37,20 +37,20 @@
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
             
-            <p class='text-justify attribute'><strong>Start Time: </strong>2020-09-26 22:01:15</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-10-27 20:21:32</p>
             
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
             
-            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-09-26 23:31:10</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-10-27 22:48:11</p>
             
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>1h 15 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>1h 55 min</p>
         </div>
       </div>
       </div>
@@ -360,9 +360,9 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_cover_edit_books.py", line 91, in test_upload_jpg
-    self.assertTrue(self.check_element_on_page((By.ID, 'flash_alert')))
-AssertionError: False is not true</pre>
+  File "C:\Entwicklung\calibre-web-test\test\test_cover_edit_books.py", line 92, in test_upload_jpg
+    self.assertTrue(self.check_element_on_page((By.ID, 'flash_alert')), "BMP file is not detected")
+AssertionError: False is not true : BMP file is not detected</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -397,11 +397,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvert</td>
         <td class="text-center">11</td>
-        <td class="text-center">9</td>
-        <td class="text-center">2</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -465,64 +465,20 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft5.7" class="none bg-danger">
+        <tr id='pt5.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvert - test_email_failed</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft5.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft5.7" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft5.7').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_ebook_convert.py", line 423, in test_email_failed
-    self.assertEqual(ret[-1]['result'], 'Failed')
-AssertionError: 'Finished' != 'Failed'
-- Finished
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft5.8" class="none bg-danger">
+        <tr id='pt5.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvert - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft5.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft5.8" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft5.8').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_ebook_convert.py", line 397, in test_email_only
-    self.assertEqual(ret[-1]['result'], 'Finished')
-AssertionError: 'Failed' != 'Finished'
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -555,15 +511,15 @@ AssertionError: 'Failed' != 'Finished'
     
 
 
-    <tr id="su" class="skipClass">
-        <td>TestEditAdditionalBooks</td>
-        <td class="text-center">11</td>
-        <td class="text-center">9</td>
+    <tr id="su" class="passClass">
+        <td>TestEbookConvertGDrive</td>
+        <td class="text-center">6</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 11)">Detail</a>
+            <a onclick="showClassDetail('c6', 6)">Detail</a>
         </td>
     </tr>
 
@@ -571,7 +527,7 @@ AssertionError: 'Failed' != 'Finished'
     
         <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
+                <div class='testcase'>TestEbookConvertGDrive - test_convert_email</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -580,7 +536,7 @@ AssertionError: 'Failed' != 'Finished'
     
         <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
+                <div class='testcase'>TestEbookConvertGDrive - test_convert_failed_and_email</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -589,7 +545,7 @@ AssertionError: 'Failed' != 'Finished'
     
         <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+                <div class='testcase'>TestEbookConvertGDrive - test_convert_only</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -598,7 +554,7 @@ AssertionError: 'Failed' != 'Finished'
     
         <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+                <div class='testcase'>TestEbookConvertGDrive - test_convert_parameter</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -607,7 +563,7 @@ AssertionError: 'Failed' != 'Finished'
     
         <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+                <div class='testcase'>TestEbookConvertGDrive - test_email_failed</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -615,6 +571,84 @@ AssertionError: 'Failed' != 'Finished'
     
     
         <tr id='pt6.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertGDrive - test_email_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestEditAdditionalBooks</td>
+        <td class="text-center">12</td>
+        <td class="text-center">10</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c7', 12)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt7.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -623,7 +657,7 @@ AssertionError: 'Failed' != 'Finished'
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id='pt7.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -632,7 +666,7 @@ AssertionError: 'Failed' != 'Finished'
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id='pt7.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -641,7 +675,7 @@ AssertionError: 'Failed' != 'Finished'
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id='pt7.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -650,19 +684,19 @@ AssertionError: 'Failed' != 'Finished'
     
     
     
-        <tr id="st6.10" class="none bg-warning">
+        <tr id="st7.11" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st6.10')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.11')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st6.10" class="popup_window test_output" style="display:none;">
+                <div id="div_st7.11" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st6.10').style.display='none'"><span
+                                onclick='document.getElementById('div_st7.11').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -676,19 +710,19 @@ AssertionError: 'Failed' != 'Finished'
     
     
     
-        <tr id="st6.11" class="none bg-warning">
+        <tr id="st7.12" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st6.11')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st6.11" class="popup_window test_output" style="display:none;">
+                <div id="div_st7.12" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st6.11').style.display='none'"><span
+                                onclick='document.getElementById('div_st7.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -703,21 +737,21 @@ AssertionError: 'Failed' != 'Finished'
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">33</td>
-        <td class="text-center">28</td>
+        <td class="text-center">30</td>
         <td class="text-center">1</td>
-        <td class="text-center">2</td>
+        <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 33)">Detail</a>
+            <a onclick="showClassDetail('c8', 33)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -726,36 +760,16 @@ AssertionError: 'Failed' != 'Finished'
     
     
     
-        <tr id="et7.2" class="none bg-info">
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et7.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et7.2" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et7.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_edit_books.py", line 184, in test_edit_author
-    self.assertEqual(u'O0ü name', author.get_attribute('value'))
-AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -764,7 +778,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id='pt8.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -773,7 +787,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id='pt8.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -782,7 +796,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id='pt8.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -791,7 +805,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.7' class='hiddenRow bg-success'>
+        <tr id='pt8.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -800,7 +814,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.8' class='hiddenRow bg-success'>
+        <tr id='pt8.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -809,7 +823,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.9' class='hiddenRow bg-success'>
+        <tr id='pt8.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -818,7 +832,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.10' class='hiddenRow bg-success'>
+        <tr id='pt8.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -827,7 +841,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.11' class='hiddenRow bg-success'>
+        <tr id='pt8.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -836,7 +850,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.12' class='hiddenRow bg-success'>
+        <tr id='pt8.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -845,7 +859,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.13' class='hiddenRow bg-success'>
+        <tr id='pt8.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -854,19 +868,19 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id="st7.14" class="none bg-warning">
+        <tr id="st8.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st7.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st8.14" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st7.14').style.display='none'"><span
+                                onclick='document.getElementById('div_st8.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -880,7 +894,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.15' class='hiddenRow bg-success'>
+        <tr id='pt8.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -889,7 +903,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.16' class='hiddenRow bg-success'>
+        <tr id='pt8.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -898,48 +912,28 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id="et7.17" class="none bg-info">
+        <tr id='pt8.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et7.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et7.17" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et7.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_edit_books.py", line 88, in test_edit_title
-    self.assertEqual(u'O0ü name', title.get_attribute('value'))
-AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st7.18" class="none bg-warning">
+        <tr id="st8.18" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.18')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.18')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st7.18" class="popup_window test_output" style="display:none;">
+                <div id="div_st8.18" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st7.18').style.display='none'"><span
+                                onclick='document.getElementById('div_st8.18').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -953,7 +947,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.19' class='hiddenRow bg-success'>
+        <tr id='pt8.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -962,7 +956,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.20' class='hiddenRow bg-success'>
+        <tr id='pt8.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -971,7 +965,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.21' class='hiddenRow bg-success'>
+        <tr id='pt8.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -980,7 +974,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.22' class='hiddenRow bg-success'>
+        <tr id='pt8.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -989,7 +983,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.23' class='hiddenRow bg-success'>
+        <tr id='pt8.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -998,7 +992,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.24' class='hiddenRow bg-success'>
+        <tr id='pt8.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1007,7 +1001,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.25' class='hiddenRow bg-success'>
+        <tr id='pt8.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1016,7 +1010,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.26' class='hiddenRow bg-success'>
+        <tr id='pt8.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1025,7 +1019,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.27' class='hiddenRow bg-success'>
+        <tr id='pt8.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1034,7 +1028,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.28' class='hiddenRow bg-success'>
+        <tr id='pt8.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1043,7 +1037,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.29' class='hiddenRow bg-success'>
+        <tr id='pt8.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1052,7 +1046,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.30' class='hiddenRow bg-success'>
+        <tr id='pt8.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1061,7 +1055,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.31' class='hiddenRow bg-success'>
+        <tr id='pt8.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1070,7 +1064,7 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id='pt7.32' class='hiddenRow bg-success'>
+        <tr id='pt8.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1079,19 +1073,19 @@ AttributeError: 'bool' object has no attribute 'get_attribute'</pre>
     
     
     
-        <tr id="ft7.33" class="none bg-danger">
+        <tr id="ft8.33" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.33')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.33')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft7.33" class="popup_window test_output" style="display:none;">
+                <div id="div_ft8.33" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft7.33').style.display='none'"><span
+                                onclick='document.getElementById('div_ft8.33').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1109,63 +1103,95 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
     
 
 
-    <tr id="su" class="skipClass">
-        <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">19</td>
+    <tr id="su" class="passClass">
+        <td>TestEditBooksList</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">19</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c8', 19)">Detail</a>
+            <a onclick="showClassDetail('c9', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="st8.1" class="none bg-warning">
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.1')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestEditBooksList - test_edit_books_list</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.2" class="none bg-warning">
+        <tr id='pt9.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_list_visibility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt9.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_merge_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="failClass">
+        <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">19</td>
+        <td class="text-center">17</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c10', 19)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt10.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft10.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.2')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st8.2" class="popup_window test_output" style="display:none;">
+                <div id="div_ft10.2" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.2').style.display='none'"><span
+                                onclick='document.getElementById('div_ft10.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
+                        <pre class="text-left">Traceback (most recent call last):
+  File "C:\Entwicklung\calibre-web-test\test\test_edit_ebooks_gdrive.py", line 339, in test_edit_author
+    self.assertEqual(u'Pipo, Pipe', author.get_attribute('value'))
+AssertionError: 'Pipo, Pipe' != 'Pipo| Pipe'
+- Pipo, Pipe
+?     ^
++ Pipo| Pipe
+?     ^</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1175,439 +1201,170 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
     
     
     
-        <tr id="st8.3" class="none bg-warning">
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.3')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.3" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.4" class="none bg-warning">
+        <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.4')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.4" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.5" class="none bg-warning">
+        <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.5')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.5" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.6" class="none bg-warning">
+        <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.6')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.6" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.6').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.7" class="none bg-warning">
+        <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.7')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.7" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.7').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.8" class="none bg-warning">
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.8')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.8" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.8').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.9" class="none bg-warning">
+        <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.9')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.9" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.9').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.10" class="none bg-warning">
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.10')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.10" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.10').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.11" class="none bg-warning">
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.11')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.11" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.11').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.12" class="none bg-warning">
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.12')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.12" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.12').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.13" class="none bg-warning">
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.13')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.13" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.14" class="none bg-warning">
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.14')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.14" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.14').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.15" class="none bg-warning">
+        <tr id='pt10.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.15')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.15" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.15').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.16" class="none bg-warning">
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.16')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.16" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.17" class="none bg-warning">
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.17')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.17" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.18" class="none bg-warning">
+        <tr id='pt10.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.18')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.18" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st8.19" class="none bg-warning">
+        <tr id="ft10.19" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.19')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.19')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st8.19" class="popup_window test_output" style="display:none;">
+                <div id="div_ft10.19" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st8.19').style.display='none'"><span
+                                onclick='document.getElementById('div_ft10.19').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
-                        <pre class="text-left">client_secrets.json and/or gdrive_credentials file is missing</pre>
+                        <pre class="text-left">Traceback (most recent call last):
+  File "C:\Entwicklung\calibre-web-test\test\test_edit_ebooks_gdrive.py", line 691, in test_upload_cover_hdd
+    self.assertEqual(reader.read(), resp.content)
+AssertionError: b'\xf[35 chars]01\x00\x00\x01\x00\x01\x00\x00\xff\xdb\x00C\x0[46400 chars]\xd9' != b'\xf[35 chars]01\x01\x00`\x00`\x00\x00\xff\xdb\x00C\x00\x08\[46837 chars]\xd9'</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1626,13 +1383,13 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 3)">Detail</a>
+            <a onclick="showClassDetail('c11', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1641,7 +1398,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1650,7 +1407,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1660,516 +1417,75 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
+    <tr id="su" class="passClass">
+        <td>TestSSL</td>
+        <td class="text-center">5</td>
         <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 5)">Detail</a>
+            <a onclick="showClassDetail('c12', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et10.1" class="none bg-info">
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_email_ssl)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et10.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_email_ssl.py", line 53, in setUpClass
-    cls.setup_server(False, {'mail_server':'127.0.0.1', 'mail_port':'1027',
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 611, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 321, in execute
-    self.error_handler.check_response(response)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\errorhandler.py", line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id="mail_use_ssl"]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.2" class="none bg-info">
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>tearDownClass (test_gdrive_setup)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.2" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et10.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_gdrive_setup.py", line 60, in tearDownClass
-    cls.driver.get("http://127.0.0.1:8083")
-AttributeError: 'NoneType' object has no attribute 'get'</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.3" class="none bg-info">
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>tearDownClass (test_kobo_sync)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.3" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et10.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x08214A00>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 48, in tearDownClass
-    cls.stop_calibre_web()
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 367, in stop_calibre_web
-    cls.driver.find_element_by_id('admin_stop').click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=51658): Max retries exceeded with url: /session/60dc57f9-d830-4dbc-bb2f-ee04e905a0e6/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x08214A00>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.4" class="none bg-info">
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>tearDownClass (test_user_template)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.4" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et10.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FFDEE0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 27, in tearDownClass
-    cls.stop_calibre_web()
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 367, in stop_calibre_web
-    cls.driver.find_element_by_id('admin_stop').click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FFDEE0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.5" class="none bg-info">
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>tearDownClass (test_visiblilitys)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.5" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et10.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04051CB8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 31, in tearDownClass
-    cls.stop_calibre_web()
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 367, in stop_calibre_web
-    cls.driver.find_element_by_id('admin_stop').click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04051CB8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>TestSetupGdrive</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c11', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et11.1" class="none bg-info">
-            <td>
-                <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et11.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_gdrive_setup.py", line 89, in test_config_gdrive
-    self.fill_initial_config(dict(config_calibre_dir=TEST_DB[:-1], config_use_google_drive=1))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 199, in fill_initial_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, "config_calibre_dir")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="skipClass">
-        <td>TestGoodreads</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">3</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c12', 3)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="st12.1" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestGoodreads - test_author_page</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.1')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st12.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st12.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Skipping Goodread Test, no config file found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st12.2" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.2')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st12.2" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st12.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Skipping Goodread Test, no config file found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st12.3" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestGoodreads - test_goodreads_about</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.3')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st12.3" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st12.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Skipping Goodread Test, no config file found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
     <tr id="su" class="passClass">
-        <td>TestCalibreHelper</td>
-        <td class="text-center">16</td>
-        <td class="text-center">16</td>
+        <td>TestSetupGdrive</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 16)">Detail</a>
+            <a onclick="showClassDetail('c13', 1)">Detail</a>
         </td>
     </tr>
 
@@ -2177,777 +1493,65 @@ AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
     
         <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
+                <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
-    
-        <tr id='pt13.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_random_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>TestKoboSync</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c14', 8)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="ft14.1" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestKoboSync - test_kobo_about</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft14.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 561, in test_kobo_about
-    self.assertTrue(self.goto_page('nav_about'))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et14.2" class="none bg-info">
-            <td>
-                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.2" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et14.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x08168D78>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 423, in test_shelves_add_remove_books
-    self.inital_sync()
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 59, in inital_sync
-    self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=51658): Max retries exceeded with url: /session/60dc57f9-d830-4dbc-bb2f-ee04e905a0e6/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x08168D78>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et14.3" class="none bg-info">
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.3" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et14.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x053E8208>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 253, in test_sync_changed_book
-    self.inital_sync()
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 59, in inital_sync
-    self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=51658): Max retries exceeded with url: /session/60dc57f9-d830-4dbc-bb2f-ee04e905a0e6/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x053E8208>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et14.4" class="none bg-info">
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_invalid</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.4" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et14.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 205, in test_sync_invalid
-    r = requests.post(self.kobo_adress+'x/v1/auth/device', json=payload)
-TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et14.5" class="none bg-info">
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.5" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et14.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x053E8538>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 492, in test_sync_reading_state
-    self.inital_sync()
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 59, in inital_sync
-    self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=51658): Max retries exceeded with url: /session/60dc57f9-d830-4dbc-bb2f-ee04e905a0e6/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x053E8538>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et14.6" class="none bg-info">
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.6" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et14.6').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x053E8898>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 267, in test_sync_shelf
-    self.inital_sync()
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 59, in inital_sync
-    self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=51658): Max retries exceeded with url: /session/60dc57f9-d830-4dbc-bb2f-ee04e905a0e6/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x053E8898>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et14.7" class="none bg-info">
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.7" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et14.7').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x053E8C40>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 218, in test_sync_unchanged
-    self.inital_sync()
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 59, in inital_sync
-    self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=51658): Max retries exceeded with url: /session/60dc57f9-d830-4dbc-bb2f-ee04e905a0e6/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x053E8C40>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et14.8" class="none bg-info">
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_upload</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.8" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et14.8').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0802DF88>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 232, in test_sync_upload
-    self.inital_sync()
-  File "C:\Entwicklung\calibre-web-test\test\test_kobo_sync.py", line 59, in inital_sync
-    self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=51658): Max retries exceeded with url: /session/60dc57f9-d830-4dbc-bb2f-ee04e905a0e6/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0802DF88>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
 
 
     <tr id="su" class="passClass">
-        <td>TestLdapLogin</td>
-        <td class="text-center">10</td>
-        <td class="text-center">10</td>
+        <td>TestGoodreads</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 10)">Detail</a>
+            <a onclick="showClassDetail('c14', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_author_page</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestGoodreads - test_goodreads_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestKoboSync</td>
+        <td class="text-center">8</td>
+        <td class="text-center">8</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c15', 8)">Detail</a>
         </td>
     </tr>
 
@@ -2955,7 +1559,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
         <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
+                <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2964,7 +1568,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
         <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
+                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2973,7 +1577,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
         <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
+                <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2982,7 +1586,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
         <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
+                <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2991,7 +1595,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
         <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
+                <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3000,7 +1604,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
         <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
+                <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3009,7 +1613,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
         <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
+                <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3017,6 +1621,119 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
     
         <tr id='pt15.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestKoboSync - test_sync_upload</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestLdapLogin</td>
+        <td class="text-center">11</td>
+        <td class="text-center">10</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c16', 11)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt16.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st16.2" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st16.2')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st16.2" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_st16.2').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Unknown how to test certificate</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3025,7 +1742,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -3034,7 +1751,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -3044,50 +1761,30 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5165
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestLogging</td>
         <td class="text-center">7</td>
-        <td class="text-center">4</td>
-        <td class="text-center">2</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 7)">Detail</a>
+            <a onclick="showClassDetail('c17', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft16.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft16.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_logging.py", line 161, in test_access_log_recover
-    self.assertFalse(os.path.isfile(os.path.join(CALIBRE_WEB_PATH, 'hö lo', 'lü g')))
-AssertionError: True is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3096,7 +1793,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3105,19 +1802,19 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id="st16.4" class="none bg-warning">
+        <tr id="st17.4" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st16.4')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st17.4')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st16.4" class="popup_window test_output" style="display:none;">
+                <div id="div_st17.4" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st16.4').style.display='none'"><span
+                                onclick='document.getElementById('div_st17.4').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3131,7 +1828,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3140,36 +1837,16 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id="ft16.6" class="none bg-danger">
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.6" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft16.6').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_logging.py", line 135, in test_logfile_recover
-    self.assertFalse(os.path.isfile(os.path.join(CALIBRE_WEB_PATH, 'hü lo', 'lö g')))
-AssertionError: True is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3187,13 +1864,13 @@ AssertionError: True is not false</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 12)">Detail</a>
+            <a onclick="showClassDetail('c18', 12)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3202,7 +1879,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3211,7 +1888,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3220,7 +1897,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3229,7 +1906,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3238,7 +1915,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3247,7 +1924,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3256,7 +1933,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt18.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3265,7 +1942,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt18.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3274,7 +1951,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.10' class='hiddenRow bg-success'>
+        <tr id='pt18.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3283,7 +1960,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.11' class='hiddenRow bg-success'>
+        <tr id='pt18.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3292,7 +1969,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt17.12' class='hiddenRow bg-success'>
+        <tr id='pt18.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3310,13 +1987,13 @@ AssertionError: True is not false</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 2)">Detail</a>
+            <a onclick="showClassDetail('c19', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3325,7 +2002,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3343,13 +2020,13 @@ AssertionError: True is not false</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 20)">Detail</a>
+            <a onclick="showClassDetail('c20', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3358,7 +2035,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3367,7 +2044,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3376,7 +2053,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.4' class='hiddenRow bg-success'>
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3385,7 +2062,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3394,7 +2071,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3403,7 +2080,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3412,7 +2089,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.8' class='hiddenRow bg-success'>
+        <tr id='pt20.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3421,7 +2098,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.9' class='hiddenRow bg-success'>
+        <tr id='pt20.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3430,7 +2107,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.10' class='hiddenRow bg-success'>
+        <tr id='pt20.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3439,7 +2116,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.11' class='hiddenRow bg-success'>
+        <tr id='pt20.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3448,7 +2125,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.12' class='hiddenRow bg-success'>
+        <tr id='pt20.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3457,7 +2134,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.13' class='hiddenRow bg-success'>
+        <tr id='pt20.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3466,7 +2143,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.14' class='hiddenRow bg-success'>
+        <tr id='pt20.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3475,7 +2152,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.15' class='hiddenRow bg-success'>
+        <tr id='pt20.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3484,7 +2161,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.16' class='hiddenRow bg-success'>
+        <tr id='pt20.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3493,7 +2170,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.17' class='hiddenRow bg-success'>
+        <tr id='pt20.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3502,7 +2179,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.18' class='hiddenRow bg-success'>
+        <tr id='pt20.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3511,7 +2188,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.19' class='hiddenRow bg-success'>
+        <tr id='pt20.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3520,7 +2197,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt19.20' class='hiddenRow bg-success'>
+        <tr id='pt20.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3538,13 +2215,13 @@ AssertionError: True is not false</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 5)">Detail</a>
+            <a onclick="showClassDetail('c21', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3553,7 +2230,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3562,7 +2239,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3571,7 +2248,7 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3580,25 +2257,25 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id="ft20.5" class="none bg-danger">
+        <tr id="ft21.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft20.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft20.5" class="popup_window test_output" style="display:none;">
+                <div id="div_ft21.5" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft20.5').style.display='none'"><span
+                                onclick='document.getElementById('div_ft21.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
   File "C:\Entwicklung\calibre-web-test\test\test_reader.py", line 59, in test_txt_reader
-    self.assertTrue('hörte' in content.text, 'Encoding of textfile viewer is not respected properly')
+    self.assertTrue('h�rte' in content.text, 'Encoding of textfile viewer is not respected properly')
 AssertionError: False is not true : Encoding of textfile viewer is not respected properly</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -3618,13 +2295,13 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 7)">Detail</a>
+            <a onclick="showClassDetail('c22', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3633,7 +2310,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3642,7 +2319,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3651,7 +2328,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt21.4' class='hiddenRow bg-success'>
+        <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3660,7 +2337,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt21.5' class='hiddenRow bg-success'>
+        <tr id='pt22.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3669,7 +2346,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt21.6' class='hiddenRow bg-success'>
+        <tr id='pt22.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3678,7 +2355,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt21.7' class='hiddenRow bg-success'>
+        <tr id='pt22.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3696,13 +2373,13 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 11)">Detail</a>
+            <a onclick="showClassDetail('c23', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3711,7 +2388,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3720,7 +2397,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3729,7 +2406,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3738,7 +2415,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3747,7 +2424,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.6' class='hiddenRow bg-success'>
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3756,7 +2433,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.7' class='hiddenRow bg-success'>
+        <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3765,7 +2442,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.8' class='hiddenRow bg-success'>
+        <tr id='pt23.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3774,7 +2451,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.9' class='hiddenRow bg-success'>
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3783,19 +2460,19 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id="st22.10" class="none bg-warning">
+        <tr id="st23.10" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.10')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.10')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.10" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.10" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st22.10').style.display='none'"><span
+                                onclick='document.getElementById('div_st23.10').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3809,7 +2486,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt22.11' class='hiddenRow bg-success'>
+        <tr id='pt23.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3827,13 +2504,13 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 8)">Detail</a>
+            <a onclick="showClassDetail('c24', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3842,7 +2519,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3851,7 +2528,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3860,7 +2537,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3869,7 +2546,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3878,7 +2555,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3887,19 +2564,19 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id="st23.7" class="none bg-warning">
+        <tr id="st24.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st24.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st24.7" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st23.7').style.display='none'"><span
+                                onclick='document.getElementById('div_st24.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3913,7 +2590,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3923,6027 +2600,484 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUserTemplate</td>
-        <td class="text-center">38</td>
+        <td class="text-center">21</td>
+        <td class="text-center">21</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">38</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 38)">Detail</a>
+            <a onclick="showClassDetail('c25', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et24.1" class="none bg-info">
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DCA130>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 541, in test_allow_column_restriction
-    self.fill_view_config({'config_restricted_column':"Custom Text 人物 *'()&"})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DCA130>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.2" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.2" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DCA910>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DCA910>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.3" class="none bg-info">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.3" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DB3928>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 477, in test_allow_tag_restriction
-    restricts = self.list_restrictions(RESTRICT_TAG_TEMPLATE)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 512, in list_restrictions
-    WebDriverWait(self.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DB3928>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.4" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.4" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DCA190>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DCA190>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.5" class="none bg-info">
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.5" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DB38B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 285, in test_archived_format_template
-    self.fill_view_config({'show_32768':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DB38B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.6" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.6" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.6').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DB37A8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DB37A8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.7" class="none bg-info">
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.7" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.7').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C845B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 312, in test_author_user_template
-    self.fill_view_config({'show_64':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C845B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.8" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_author_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.8" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.8').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C846E8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C846E8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.9" class="none bg-info">
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.9" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.9').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C842F8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 124, in test_best_user_template
-    self.fill_view_config({'show_128':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C842F8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.10" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_best_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.10" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.10').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C98D48>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C98D48>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.11" class="none bg-info">
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.11" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.11').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C98A78>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 204, in test_category_user_template
-    self.fill_view_config({'show_8':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C98A78>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.12" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_category_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.12" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.12').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C98AF0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C98AF0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.13" class="none bg-info">
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.13" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C98EB0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 585, in test_deny_column_restriction
-    self.fill_view_config({'config_restricted_column':"Custom Text 人物 *'()&"})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C98EB0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.14" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.14" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.14').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07CA7E98>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07CA7E98>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.15" class="none bg-info">
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.15" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.15').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07CA7AD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 508, in test_deny_tag_restriction
-    restricts = self.list_restrictions(RESTRICT_TAG_TEMPLATE)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 512, in list_restrictions
-    WebDriverWait(self.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07CA7AD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.16" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.16" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DBFDD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DBFDD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.17" class="none bg-info">
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.17" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DBFE20>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 366, in test_detail_random_user_template
-    self.fill_view_config({'Show_detail_random':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DBFE20>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.18" class="none bg-info">
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.18" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DBF3D0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DBF3D0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.19" class="none bg-info">
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.19" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.19').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07DBF478>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 258, in test_format_user_template
-    self.fill_view_config({'show_16384':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07DBF478>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.20" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_format_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.20" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07C8AF88>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07C8AF88>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.21" class="none bg-info">
+        <tr id='pt25.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.21')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.21" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.21').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x055AEAC0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 97, in test_hot_user_template
-    self.fill_view_config({'show_16':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x055AEAC0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.22" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.22')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.22" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.22').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x055AE3D0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x055AE3D0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.23" class="none bg-info">
+        <tr id='pt25.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.23')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.23" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.23').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07D9C250>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 151, in test_language_user_template
-    self.fill_view_config({'show_2':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07D9C250>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.24" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_language_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.24')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.24" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.24').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x055AEB68>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x055AEB68>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.25" class="none bg-info">
+        <tr id='pt25.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.25')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.25" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.25').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07D9C9D0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 455, in test_limit_book_languages
-    self.edit_user('admin', {'default_language': 'Norwegian Bokmål' })
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 638, in edit_user
-    user = cls.driver.find_elements_by_xpath("//table[@id='table_user']/tbody/tr/td/a")
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/elements (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07D9C9D0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.26" class="none bg-info">
+        <tr id='pt25.15' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.26')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.26" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.26').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x055AEB38>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x055AEB38>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.27" class="none bg-info">
+        <tr id='pt25.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.27')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.27" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.27').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03F9D238>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 231, in test_publisher_user_template
-    self.fill_view_config({'show_4096':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03F9D238>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.28" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.28')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.28" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.28').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x07D9CE50>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x07D9CE50>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.29" class="none bg-info">
+        <tr id='pt25.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.29')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.29" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.29').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03F9DA60>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 39, in test_random_user_template
-    self.fill_view_config({'show_32':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03F9DA60>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.30" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_random_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.30')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.30" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.30').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03F9D5B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03F9D5B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.31" class="none bg-info">
+        <tr id='pt25.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.31')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.31" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.31').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FD02B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 339, in test_read_user_template
-    self.fill_view_config({'show_256': 0 })
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FD02B0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.32" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_read_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.32')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.32" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.32').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03F9DFD0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03F9DFD0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.33" class="none bg-info">
+        <tr id='pt25.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.33')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.33" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.33').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FD0AD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 65, in test_recent_user_template
-    self.fill_view_config({'show_4':0,'show_8':0, 'show_16':0, 'show_32':0, 'show_64':0, 'show_128':0,
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FD0AD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.34" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.34')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.34" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.34').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FD0B50>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FD0B50>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.35" class="none bg-info">
+        <tr id='pt25.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.35')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.35" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.35').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FD0DD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 178, in test_series_user_template
-    self.fill_view_config({'show_4':0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FD0DD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et24.36" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_series_user_template</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.36')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.36" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.36').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FFD3A0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FFD3A0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.37" class="none bg-info">
+        <tr id='pt25.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.37')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.37" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.37').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FFD808>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 445, in test_ui_language_settings
-    self.edit_user('admin', {'locale': 'Deutsch'})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 638, in edit_user
-    user = cls.driver.find_elements_by_xpath("//table[@id='table_user']/tbody/tr/td/a")
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 410, in find_elements_by_xpath
-    return self.find_elements(by=By.XPATH, value=xpath)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 1005, in find_elements
-    return self.execute(Command.FIND_ELEMENTS, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/elements (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FFD808>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et24.38" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et24.38')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et24.38" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et24.38').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x03FFDB38>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_user_template.py", line 34, in tearDown
-    if not self.check_user_logged_in('admin'):
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 89, in check_user_logged_in
-    user_element = cls.check_element_on_page((By.ID, "top_user"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=53724): Max retries exceeded with url: /session/d0d6b3f4-a0ab-4a8d-a7f7-95af7d611b44/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x03FFDB38>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestCalibreWebVisibilitys</td>
+        <td class="text-center">37</td>
         <td class="text-center">31</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">31</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 31)">Detail</a>
+            <a onclick="showClassDetail('c26', 37)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et25.1" class="none bg-info">
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.1" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0402FA30>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 43, in test_about
-    self.assertTrue(self.check_element_on_page((By.ID, 'libs')))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0402FA30>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.2" class="none bg-info">
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.2" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0402FC28>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 334, in test_admin_SMTP_Settings
-    submit = self.check_element_on_page((By.NAME, "submit"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0402FC28>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.3" class="none bg-info">
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.3" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040AA190>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 348, in test_admin_add_user
-    self.driver.find_element_by_id("back").click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040AA190>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.4" class="none bg-info">
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.4" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.4').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040AA538>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 323, in test_admin_change_password
-    self.change_current_user_password("1234")
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 191, in change_current_user_password
-    cls.driver.find_element_by_id("top_user").click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040AA538>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.5" class="none bg-info">
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.5" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.5').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040AA8E0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 286, in test_admin_change_visibility_archived
-    self.change_user({'show_32768': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040AA8E0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.6" class="none bg-info">
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.6" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.6').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040AA598>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 300, in test_admin_change_visibility_authors
-    self.change_user({'show_64': 0, 'email': 'a@f.de'})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040AA598>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.7" class="none bg-info">
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.7" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.7').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040AADD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 313, in test_admin_change_visibility_category
-    self.change_user({'show_8': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040AADD8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.8" class="none bg-info">
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.8" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.8').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040DC628>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 276, in test_admin_change_visibility_file_formats
-    self.change_user({'show_16384': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040DC628>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.9" class="none bg-info">
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.9" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.9').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040DC118>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 224, in test_admin_change_visibility_hot
-    self.change_user({'show_16': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040DC118>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.10" class="none bg-info">
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.10" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.10').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04113100>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 214, in test_admin_change_visibility_language
-    self.change_user({'show_2': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04113100>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.11" class="none bg-info">
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.11" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.11').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04113430>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 256, in test_admin_change_visibility_publisher
-    self.change_user({'show_4096': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04113430>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.12" class="none bg-info">
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.12" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.12').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x041131A8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 234, in test_admin_change_visibility_random
-    self.change_user({'show_32': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x041131A8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.13" class="none bg-info">
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.13" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.13').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04113EE0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 173, in test_admin_change_visibility_rated
-    self.change_user({'show_128': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04113EE0>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.14" class="none bg-info">
+        <tr id='pt26.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.14" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.14').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04148238>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 266, in test_admin_change_visibility_rating
-    self.change_user({'show_8192': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04148238>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.15" class="none bg-info">
+        <tr id='pt26.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.15" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.15').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04148358>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 183, in test_admin_change_visibility_read
-    self.change_user({'show_256': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04148358>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.16" class="none bg-info">
+        <tr id='pt26.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.16" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04148CE8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 246, in test_admin_change_visibility_series
-    self.change_user({'show_4': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04148CE8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.17" class="none bg-info">
+        <tr id='pt26.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.17" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.17').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0417A0E8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 610, in test_allow_columns
-    self.fill_view_config({'config_restricted_column': "Custom Text 人物 *'()&"})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0417A0E8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.18" class="none bg-info">
+        <tr id='pt26.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.18" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.18').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0417A508>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 469, in test_allow_tags
-    self.create_shelf('allow', False)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 775, in create_shelf
-    ele = self.check_element_on_page((By.ID,'title'))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0417A508>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.19" class="none bg-info">
+        <tr id='pt26.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.19" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.19').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0417A898>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 805, in test_archive_books
-    details = self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0417A898>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.20" class="none bg-info">
+        <tr id='pt26.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.20" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.20').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0417AFB8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 762, in test_authors_max_settings
-    self.create_shelf('Author', False)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 775, in create_shelf
-    ele = self.check_element_on_page((By.ID,'title'))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0417AFB8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.21" class="none bg-info">
+        <tr id='pt26.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.21')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.21" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.21').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x0417AAA8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 369, in test_change_title
-    self.fill_view_config({'config_calibre_web_title': 'Lü 执'})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 286, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, "discover")))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x0417AAA8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.22" class="none bg-info">
+        <tr id='pt26.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.22')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.22" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.22').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x041489E8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 39, in test_checked_logged_in
-    self.assertTrue(self.check_element_on_page((By.NAME, 'query')))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x041489E8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.23" class="none bg-info">
+        <tr id='pt26.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.23')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.23" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.23').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04113628>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 712, in test_hide_custom_column
-    self.get_book_details(5)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1146, in get_book_details
-    cls.driver.get(root_url + "/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04113628>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.24" class="none bg-info">
+        <tr id='pt26.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.24')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.24" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.24').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 664, in test_link_column_to_read_status
-    self.assertTrue(search['cust_columns']['Custom Bool 1 Ä'])
-TypeError: 'bool' object is not subscriptable</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.25" class="none bg-info">
+        <tr id='pt26.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.25')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.25" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.25').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x096385F8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 49, in test_random_books_available
-    self.assertTrue(self.check_element_on_page((By.ID, "books_rand")))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x096385F8>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.26" class="none bg-info">
+        <tr id='pt26.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.26')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.26" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.26').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x040AAB50>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 551, in test_restrict_columns
-    self.edit_book(10, custom_content={"Custom Text 人物 *'()&": 'test'})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1302, in edit_book
-    cls.driver.get(root_url + "/admin/book/"+str(id))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/url (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x040AAB50>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.27" class="none bg-info">
+        <tr id='pt26.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st26.28" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_authors</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.27')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.28')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et25.27" class="popup_window test_output" style="display:none;">
+                <div id="div_st26.28" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.27').style.display='none'"><span
+                                onclick='document.getElementById('div_st26.28').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 395, in test_restrict_tags
-    self.assertEqual(len(elements['include_tags']), 1)
-TypeError: 'bool' object is not subscriptable</pre>
+                        <pre class="text-left">ToDo</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -9953,79 +3087,139 @@ TypeError: 'bool' object is not subscriptable</pre>
     
     
     
-        <tr id="et25.28" class="none bg-info">
+        <tr id="st26.29" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_formats</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.29')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st26.29" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_st26.29').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">ToDo</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="st26.30" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_lang</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.30')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st26.30" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_st26.30').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">ToDo</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt26.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="st26.32" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_series</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.32')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st26.32" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_st26.32').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">ToDo</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="st26.33" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_unread</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.33')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st26.33" class="popup_window test_output" style="display:none;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
+                                onclick='document.getElementById('div_st26.33').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">ToDo</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft26.34" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.28')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft26.34')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et25.28" class="popup_window test_output" style="display:none;">
+                <div id="div_ft26.34" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.28').style.display='none'"><span
+                                onclick='document.getElementById('div_ft26.34').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x09638E08>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\requests\adapters.py", line 439, in send
-    resp = conn.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=8083): Max retries exceeded with url: /login (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x09638E08>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 385, in test_search_functions
-    r.post('http://127.0.0.1:8083/login', data=payload)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\requests\sessions.py", line 578, in post
-    return self.request('POST', url, data=data, json=json, **kwargs)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\requests\sessions.py", line 530, in request
-    resp = self.send(prep, **send_kwargs)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\requests\sessions.py", line 643, in send
-    r = adapter.send(request, **kwargs)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\requests\adapters.py", line 516, in send
-    raise ConnectionError(e, request=request)
-requests.exceptions.ConnectionError: HTTPConnectionPool(host='127.0.0.1', port=8083): Max retries exceeded with url: /login (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x09638E08>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
+  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 389, in test_search_functions
+    self.assertEqual(200, resp.status_code)
+AssertionError: 200 != 404</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -10035,277 +3229,188 @@ requests.exceptions.ConnectionError: HTTPConnectionPool(host='127.0.0.1', port=8
     
     
     
-        <tr id="et25.29" class="none bg-info">
+        <tr id='pt26.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.29')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.29" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.29').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04051298>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 376, in test_search_string
-    field = self.check_element_on_page((By.ID, "query"))
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 630, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\wait.py", line 71, in until
-    value = method(self._driver)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 64, in __call__
-    return _find_element(driver, self.locator)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\support\expected_conditions.py", line 411, in _find_element
-    return driver.find_element(*by)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04051298>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.30" class="none bg-info">
+        <tr id='pt26.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.30')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.30" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.30').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04051628>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 99, in test_user_email_available
-    self.driver.find_element_by_id("top_user").click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04051628>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.31" class="none bg-info">
+        <tr id='pt26.37' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.31')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.31" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_et25.31').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 159, in _new_conn
-    conn = connection.create_connection(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 84, in create_connection
-    raise err
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\connection.py", line 74, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
-During handling of the above exception, another exception occurred:
 
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 670, in urlopen
-    httplib_response = self._make_request(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 392, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File "C:\python38\lib\http\client.py", line 1240, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1286, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1235, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File "C:\python38\lib\http\client.py", line 1006, in _send_output
-    self.send(msg)
-  File "C:\python38\lib\http\client.py", line 946, in send
-    self.connect()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 187, in connect
-    conn = self._new_conn()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connection.py", line 171, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPConnection object at 0x04051B38>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte
+    <tr id="su" class="passClass">
+        <td>TestCalibreHelper</td>
+        <td class="text-center">16</td>
+        <td class="text-center">16</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c27', 16)">Detail</a>
+        </td>
+    </tr>
 
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "C:\Entwicklung\calibre-web-test\test\test_visiblilitys.py", line 116, in test_user_visibility_sidebar
-    self.change_user({'show_32': 0})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 877, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webdriver.py", line 319, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 374, in execute
-    return self._request(command_info[0], url, body=data)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\remote_connection.py", line 397, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 79, in request
-    return self.request_encode_body(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\request.py", line 171, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\poolmanager.py", line 336, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 754, in urlopen
-    return self.urlopen(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\connectionpool.py", line 726, in urlopen
-    retries = retries.increment(
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\urllib3\util\retry.py", line 439, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=54028): Max retries exceeded with url: /session/e8198890-b619-43a9-9f70-4e9d85903b70/element (Caused by NewConnectionError('<urllib3.connection.HTTPConnection object at 0x04051B38>: Failed to establish a new connection: [WinError 10061] Es konnte keine Verbindung hergestellt werden, da der Zielcomputer die Verbindung verweigerte'))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+    
+    
+        <tr id='pt27.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_random_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -10313,10 +3418,10 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>283</td>
-        <td>161</td>
-        <td>8</td>
-        <td>84</td>
-        <td>30</td>
+        <td>263</td>
+        <td>6</td>
+        <td>0</td>
+        <td>14</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -10390,18 +3495,6 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>google-api-python-client</th>
-              <td>1.12.2</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>httplib2</th>
-              <td>0.18.1</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>iso-639</th>
               <td>0.4.5</td>
@@ -10420,12 +3513,6 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>oauth2client</th>
-              <td>4.1.3</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>pyasn1</th>
               <td>0.4.8</td>
@@ -10438,12 +3525,6 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>PyPDF2</th>
               <td>1.26.0</td>
@@ -10456,12 +3537,6 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>PyYAML</th>
-              <td>5.3.1</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>requests</th>
               <td>2.23.0</td>
@@ -10524,10 +3599,52 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
           
             <tr>
               <th>Pillow</th>
-              <td>7.2.0</td>
+              <td>8.0.1</td>
               <td>TestCoverEditBooks</td>
             </tr>
           
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.5</td>
+              <td>TestEbookConvertGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.18.1</td>
+              <td>TestEbookConvertGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.1</td>
+              <td>TestEbookConvertGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEbookConvertGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>Pillow</th>
+              <td>8.0.1</td>
+              <td>TestEbookConvertGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive</th>
+              <td>1.3.1</td>
+              <td>TestEbookConvertGDrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.3.1</td>
+              <td>TestEbookConvertGDrive</td>
+            </tr>
+          
             <tr>
               <th>comicapi</th>
               <td>2.1.1</td>
@@ -10536,13 +3653,13 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
           
             <tr>
               <th>lxml</th>
-              <td>4.5.2</td>
+              <td>4.6.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
             <tr>
               <th>Pillow</th>
-              <td>7.2.0</td>
+              <td>8.0.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -10554,19 +3671,61 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
           
             <tr>
               <th>lxml</th>
-              <td>4.5.2</td>
+              <td>4.6.1</td>
               <td>TestEditBooks</td>
             </tr>
           
             <tr>
               <th>Pillow</th>
-              <td>7.2.0</td>
+              <td>8.0.1</td>
               <td>TestEditBooks</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>1.12.2</td>
+              <td>1.12.5</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.18.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>Pillow</th>
+              <td>8.0.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive</th>
+              <td>1.3.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.3.1</td>
+              <td>TestEditBooksOnGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.5</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -10594,6 +3753,12 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
               <td>TestSetupGdrive</td>
             </tr>
           
+            <tr>
+              <th>goodreads</th>
+              <td>0.3.2</td>
+              <td>TestGoodreads</td>
+            </tr>
+          
             <tr>
               <th>jsonschema</th>
               <td>3.2.0</td>
@@ -10632,7 +3797,7 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5402
 </div>
 
 <script>
-    drawCircle(161, 8, 84, 30);
+    drawCircle(263, 6, 0, 14);
 </script>
 
 </div>