diff --git a/cps.py b/cps.py
index 20aa9cac..50ab0076 100755
--- a/cps.py
+++ b/cps.py
@@ -41,6 +41,8 @@ from cps.shelf import shelf
 from cps.admin import admi
 from cps.gdrive import gdrive
 from cps.editbooks import editbook
+from cps.remotelogin import remotelogin
+from cps.error_handler import init_errorhandler
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -58,14 +60,18 @@ except ImportError:
 
 def main():
     app = create_app()
+
+    init_errorhandler()
+
     app.register_blueprint(web)
     app.register_blueprint(opds)
     app.register_blueprint(jinjia)
     app.register_blueprint(about)
     app.register_blueprint(shelf)
     app.register_blueprint(admi)
-    if config.config_use_google_drive:
-        app.register_blueprint(gdrive)
+    app.register_blueprint(remotelogin)
+    # if config.config_use_google_drive:
+    app.register_blueprint(gdrive)
     app.register_blueprint(editbook)
     if kobo_available:
         app.register_blueprint(kobo)
diff --git a/cps/__init__.py b/cps/__init__.py
index 03945b57..1a7dc868 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -94,7 +94,8 @@ def create_app():
         app.root_path = app.root_path.decode('utf-8')
         app.instance_path = app.instance_path.decode('utf-8')
 
-    cache_buster.init_cache_busting(app)
+    if os.environ.get('FLASK_DEBUG'):
+    	cache_buster.init_cache_busting(app)
 
     log.info('Starting Calibre Web...')
     Principal(app)
diff --git a/cps/about.py b/cps/about.py
index f9c58738..6ea584f4 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -31,7 +31,7 @@ import werkzeug, flask, flask_login, flask_principal, jinja2
 from flask_babel import gettext as _
 
 from . import db, calibre_db, converter, uploader, server, isoLanguages, constants
-from .web import render_title_template
+from .render_template import render_title_template
 try:
     from flask_login import __version__ as flask_loginVersion
 except ImportError:
diff --git a/cps/admin.py b/cps/admin.py
index 531d855d..33939ef9 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -5,7 +5,7 @@
 #                            andy29485, idalin, Kyosfonica, wuqi, Kennyl, lemmsh,
 #                            falgh1, grunjol, csitko, ytils, xybydy, trasba, vrabe,
 #                            ruben-herold, marblepebble, JackED42, SiphonSquirrel,
-#                            apetresc, nanu-c, mutschler
+#                            apetresc, nanu-c, mutschler, GammaC0de, vuolter
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -26,24 +26,31 @@ import re
 import base64
 import json
 import time
+import operator
 from datetime import datetime, timedelta
 
 from babel import Locale as LC
 from babel.dates import format_datetime
-from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory
-from flask_login import login_required, current_user, logout_user
+from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g
+from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
 from sqlalchemy import and_
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
-from sqlalchemy.sql.expression import func
+from sqlalchemy.sql.expression import func, or_
 
 from . import constants, logger, helper, services
+from .cli import filepicker
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash
 from .gdriveutils import is_gdrive_ready, gdrive_support
-from .web import admin_required, render_title_template, before_request, unconfigured
+from .render_template import render_title_template, get_sidebar_config
 from . import debug_info
 
+try:
+    from functools import wraps
+except ImportError:
+    pass  # We're not using Python 3
+
 log = logger.create()
 
 feature_support = {
@@ -72,6 +79,49 @@ feature_support['gdrive'] = gdrive_support
 admi = Blueprint('admin', __name__)
 
 
+def admin_required(f):
+    """
+    Checks if current_user.role == 1
+    """
+
+    @wraps(f)
+    def inner(*args, **kwargs):
+        if current_user.role_admin():
+            return f(*args, **kwargs)
+        abort(403)
+
+    return inner
+
+
+def unconfigured(f):
+    """
+    Checks if calibre-web instance is not configured
+    """
+    @wraps(f)
+    def inner(*args, **kwargs):
+        if not config.db_configured:
+            return f(*args, **kwargs)
+        abort(403)
+
+    return inner
+
+@admi.before_app_request
+def before_request():
+    if current_user.is_authenticated:
+        confirm_login()
+    g.constants = constants
+    g.user = current_user
+    g.allow_registration = config.config_public_reg
+    g.allow_anonymous = config.config_anonbrowse
+    g.allow_upload = config.config_uploading
+    g.current_theme = config.config_theme
+    g.config_authors_max = config.config_authors_max
+    g.shelves_access = ub.session.query(ub.Shelf).filter(
+        or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == current_user.id)).order_by(ub.Shelf.name).all()
+    if not config.db_configured and request.endpoint not in (
+        'admin.basic_configuration', 'login', 'admin.config_pathchooser') and '/static/' not in request.path:
+        return redirect(url_for('admin.basic_configuration'))
+
 
 @admi.route("/admin")
 @login_required
@@ -143,7 +193,7 @@ def admin():
 @admin_required
 def configuration():
     if request.method == "POST":
-        return _configuration_update_helper()
+        return _configuration_update_helper(True)
     return _configuration_result()
 
 
@@ -195,6 +245,21 @@ def update_view_configuration():
     return view_configuration()
 
 
+@admi.route("/ajax/loaddialogtexts/<element_id>")
+@login_required
+def load_dialogtexts(element_id):
+    texts = { "header": "", "main": "" }
+    if element_id == "config_delete_kobo_token":
+        texts["main"] = _('Do you really want to delete the Kobo Token?')
+    elif element_id == "btndeletedomain":
+        texts["main"] = _('Do you really want to delete this domain?')
+    elif element_id == "btndeluser":
+        texts["main"] = _('Do you really want to delete this user?')
+    elif element_id == "delete_shelf":
+        texts["main"] = _('Are you sure you want to delete this shelf?')
+    return json.dumps(texts)
+
+
 @admi.route("/ajax/editdomain/<int:allow>", methods=['POST'])
 @login_required
 @admin_required
@@ -206,7 +271,10 @@ def edit_domain(allow):
     vals = request.form.to_dict()
     answer = ub.session.query(ub.Registration).filter(ub.Registration.id == vals['pk']).first()
     answer.domain = vals['value'].replace('*', '%').replace('?', '_').lower()
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
     return ""
 
 
@@ -220,7 +288,10 @@ def add_domain(allow):
     if not check:
         new_domain = ub.Registration(domain=domain_name, allow=allow)
         ub.session.add(new_domain)
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
     return ""
 
 
@@ -228,14 +299,23 @@ def add_domain(allow):
 @login_required
 @admin_required
 def delete_domain():
-    domain_id = request.form.to_dict()['domainid'].replace('*', '%').replace('?', '_').lower()
-    ub.session.query(ub.Registration).filter(ub.Registration.id == domain_id).delete()
-    ub.session.commit()
-    # If last domain was deleted, add all domains by default
-    if not ub.session.query(ub.Registration).filter(ub.Registration.allow==1).count():
-        new_domain = ub.Registration(domain="%.%",allow=1)
-        ub.session.add(new_domain)
-        ub.session.commit()
+    try:
+        domain_id = request.form.to_dict()['domainid'].replace('*', '%').replace('?', '_').lower()
+        ub.session.query(ub.Registration).filter(ub.Registration.id == domain_id).delete()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
+        # If last domain was deleted, add all domains by default
+        if not ub.session.query(ub.Registration).filter(ub.Registration.allow==1).count():
+            new_domain = ub.Registration(domain="%.%",allow=1)
+            ub.session.add(new_domain)
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
+    except KeyError:
+        pass
     return ""
 
 
@@ -250,10 +330,11 @@ def list_domain(allow):
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
-@admi.route("/ajax/editrestriction/<int:res_type>", methods=['POST'])
+@admi.route("/ajax/editrestriction/<int:res_type>", defaults={"user_id":0}, methods=['POST'])
+@admi.route("/ajax/editrestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
-def edit_restriction(res_type):
+def edit_restriction(res_type, user_id):
     element = request.form.to_dict()
     if element['id'].startswith('a'):
         if res_type == 0:  # Tags as template
@@ -267,25 +348,29 @@ def edit_restriction(res_type):
             config.config_allowed_column_value = ','.join(elementlist)
             config.save()
         if res_type == 2:  # Tags per user
-            usr_id = os.path.split(request.referrer)[-1]
-            if usr_id.isdigit() == True:
-                usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+            if isinstance(user_id, int):
+                usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
             else:
                 usr = current_user
             elementlist = usr.list_allowed_tags()
             elementlist[int(element['id'][1:])]=element['Element']
             usr.allowed_tags = ','.join(elementlist)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
         if res_type == 3:  # CColumn per user
-            usr_id = os.path.split(request.referrer)[-1]
-            if usr_id.isdigit() == True:
-                usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+            if isinstance(user_id, int):
+                usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
             else:
                 usr = current_user
             elementlist = usr.list_allowed_column_values()
             elementlist[int(element['id'][1:])]=element['Element']
             usr.allowed_column_value = ','.join(elementlist)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
     if element['id'].startswith('d'):
         if res_type == 0:  # Tags as template
             elementlist = config.list_denied_tags()
@@ -298,25 +383,29 @@ def edit_restriction(res_type):
             config.config_denied_column_value = ','.join(elementlist)
             config.save()
         if res_type == 2:  # Tags per user
-            usr_id = os.path.split(request.referrer)[-1]
-            if usr_id.isdigit() == True:
-                usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+            if isinstance(user_id, int):
+                usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
             else:
                 usr = current_user
             elementlist = usr.list_denied_tags()
             elementlist[int(element['id'][1:])]=element['Element']
             usr.denied_tags = ','.join(elementlist)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
         if res_type == 3:  # CColumn per user
-            usr_id = os.path.split(request.referrer)[-1]
-            if usr_id.isdigit() == True:
-                usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+            if isinstance(user_id, int):
+                usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
             else:
                 usr = current_user
             elementlist = usr.list_denied_column_values()
             elementlist[int(element['id'][1:])]=element['Element']
             usr.denied_column_value = ','.join(elementlist)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
     return ""
 
 def restriction_addition(element, list_func):
@@ -335,10 +424,11 @@ def restriction_deletion(element, list_func):
     return ','.join(elementlist)
 
 
-@admi.route("/ajax/addrestriction/<int:res_type>", methods=['POST'])
+@admi.route("/ajax/addrestriction/<int:res_type>", defaults={"user_id":0}, methods=['POST'])
+@admi.route("/ajax/addrestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
-def add_restriction(res_type):
+def add_restriction(res_type, user_id):
     element = request.form.to_dict()
     if res_type == 0:  # Tags as template
         if 'submit_allow' in element:
@@ -355,35 +445,46 @@ def add_restriction(res_type):
             config.config_denied_column_value = restriction_addition(element, config.list_allowed_column_values)
             config.save()
     if res_type == 2:  # Tags per user
-        usr_id = os.path.split(request.referrer)[-1]
-        if usr_id.isdigit() == True:
-            usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+        if isinstance(user_id, int):
+            usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
         else:
             usr = current_user
         if 'submit_allow' in element:
             usr.allowed_tags = restriction_addition(element, usr.list_allowed_tags)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
         elif 'submit_deny' in element:
             usr.denied_tags = restriction_addition(element, usr.list_denied_tags)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
     if res_type == 3:  # CustomC per user
-        usr_id = os.path.split(request.referrer)[-1]
-        if usr_id.isdigit() == True:
-            usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+        if isinstance(user_id, int):
+            usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
         else:
             usr = current_user
         if 'submit_allow' in element:
             usr.allowed_column_value = restriction_addition(element, usr.list_allowed_column_values)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
         elif 'submit_deny' in element:
             usr.denied_column_value = restriction_addition(element, usr.list_denied_column_values)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
     return ""
 
-@admi.route("/ajax/deleterestriction/<int:res_type>", methods=['POST'])
+@admi.route("/ajax/deleterestriction/<int:res_type>", defaults={"user_id":0}, methods=['POST'])
+@admi.route("/ajax/deleterestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
-def delete_restriction(res_type):
+def delete_restriction(res_type, user_id):
     element = request.form.to_dict()
     if res_type == 0:  # Tags as template
         if element['id'].startswith('a'):
@@ -400,36 +501,46 @@ def delete_restriction(res_type):
             config.config_denied_column_value = restriction_deletion(element, config.list_denied_column_values)
             config.save()
     elif res_type == 2:  # Tags per user
-        usr_id = os.path.split(request.referrer)[-1]
-        if usr_id.isdigit() == True:
-            usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+        if isinstance(user_id, int):
+            usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
         else:
             usr = current_user
         if element['id'].startswith('a'):
             usr.allowed_tags = restriction_deletion(element, usr.list_allowed_tags)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
         elif element['id'].startswith('d'):
             usr.denied_tags = restriction_deletion(element, usr.list_denied_tags)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
     elif res_type == 3:  # Columns per user
-        usr_id = os.path.split(request.referrer)[-1]
-        if usr_id.isdigit() == True:    # select current user if admins are editing their own rights
-            usr = ub.session.query(ub.User).filter(ub.User.id == int(usr_id)).first()
+        if isinstance(user_id, int):
+            usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
         else:
             usr = current_user
         if element['id'].startswith('a'):
             usr.allowed_column_value = restriction_deletion(element, usr.list_allowed_column_values)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
         elif element['id'].startswith('d'):
             usr.denied_column_value = restriction_deletion(element, usr.list_denied_column_values)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
     return ""
 
-
-@admi.route("/ajax/listrestriction/<int:res_type>")
+@admi.route("/ajax/listrestriction/<int:res_type>", defaults={"user_id":0})
+@admi.route("/ajax/listrestriction/<int:res_type>/<int:user_id>")
 @login_required
 @admin_required
-def list_restriction(res_type):
+def list_restriction(res_type, user_id):
     if res_type == 0:   # Tags as template
         restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
                     for i,x in enumerate(config.list_denied_tags()) if x != '' ]
@@ -443,9 +554,8 @@ def list_restriction(res_type):
                  for i,x in enumerate(config.list_allowed_column_values()) if x != '']
         json_dumps = restrict + allow
     elif res_type == 2:  # Tags per user
-        usr_id = os.path.split(request.referrer)[-1]
-        if usr_id.isdigit() == True:
-            usr = ub.session.query(ub.User).filter(ub.User.id == usr_id).first()
+        if isinstance(user_id, int):
+            usr = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
         else:
             usr = current_user
         restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
@@ -454,9 +564,8 @@ def list_restriction(res_type):
                  for i,x in enumerate(usr.list_allowed_tags()) if x != '']
         json_dumps = restrict + allow
     elif res_type == 3:  # CustomC per user
-        usr_id = os.path.split(request.referrer)[-1]
-        if usr_id.isdigit() == True:
-            usr = ub.session.query(ub.User).filter(ub.User.id==usr_id).first()
+        if isinstance(user_id, int):
+            usr = ub.session.query(ub.User).filter(ub.User.id==user_id).first()
         else:
             usr = current_user
         restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
@@ -471,14 +580,108 @@ def list_restriction(res_type):
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+@admi.route("/basicconfig/pathchooser/")
+@unconfigured
+def config_pathchooser():
+    if filepicker:
+        return pathchooser()
+    abort(403)
 
-@admi.route("/config", methods=["GET", "POST"])
+@admi.route("/ajax/pathchooser/")
+@login_required
+@admin_required
+def ajax_pathchooser():
+    return pathchooser()
+
+def pathchooser():
+    browse_for = "folder"
+    folder_only = request.args.get('folder', False) == "true"
+    file_filter = request.args.get('filter', "")
+    path = os.path.normpath(request.args.get('path', ""))
+
+    if os.path.isfile(path):
+        oldfile = path
+        path = os.path.dirname(path)
+    else:
+        oldfile = ""
+
+    abs = False
+
+    if os.path.isdir(path):
+        #if os.path.isabs(path):
+        cwd = os.path.realpath(path)
+        abs = True
+        #else:
+        #    cwd = os.path.relpath(path)
+    else:
+        cwd = os.getcwd()
+
+    cwd = os.path.normpath(os.path.realpath(cwd))
+    parentdir = os.path.dirname(cwd)
+    if not abs:
+        if os.path.realpath(cwd) == os.path.realpath("/"):
+            cwd = os.path.relpath(cwd)
+        else:
+            cwd = os.path.relpath(cwd) + os.path.sep
+        parentdir = os.path.relpath(parentdir) + os.path.sep
+
+    if os.path.realpath(cwd) == os.path.realpath("/"):
+        parentdir = ""
+
+    try:
+        folders = os.listdir(cwd)
+    except Exception:
+        folders = []
+
+    files = []
+    # locale = get_locale()
+    for f in folders:
+        try:
+            data = {"name": f, "fullpath": os.path.join(cwd, f)}
+            data["sort"] = data["fullpath"].lower()
+        except Exception:
+            continue
+
+        if os.path.isfile(os.path.join(cwd, f)):
+            if folder_only:
+                continue
+            if file_filter != "" and file_filter != f:
+                continue
+            data["type"] = "file"
+            data["size"] = os.path.getsize(os.path.join(cwd, f))
+
+            power = 0
+            while (data["size"] >> 10) > 0.3:
+                power += 1
+                data["size"] >>= 10
+            units = ("", "K", "M", "G", "T")
+            data["size"] = str(data["size"]) + " " + units[power] + "Byte"
+        else:
+            data["type"] = "dir"
+            data["size"] = ""
+
+        files.append(data)
+
+    files = sorted(files, key=operator.itemgetter("type", "sort"))
+
+    context = {
+        "cwd": cwd,
+        "files": files,
+        "parentdir": parentdir,
+        "type": browse_for,
+        "oldfile": oldfile,
+        "absolute": abs,
+    }
+    return json.dumps(context)
+
+
+@admi.route("/basicconfig", methods=["GET", "POST"])
 @unconfigured
 def basic_configuration():
     logout_user()
     if request.method == "POST":
-        return _configuration_update_helper()
-    return _configuration_result()
+        return _configuration_update_helper(configured=filepicker)
+    return _configuration_result(configured=filepicker)
 
 
 def _config_int(to_save, x, func=int):
@@ -633,13 +836,13 @@ def _configuration_ldap_helper(to_save, gdriveError):
     return reboot_required, None
 
 
-def _configuration_update_helper():
+def _configuration_update_helper(configured):
     reboot_required = False
     db_change = False
     to_save = request.form.to_dict()
     gdriveError = None
 
-    to_save['config_calibre_dir'] = re.sub('[\\/]metadata\.db$',
+    to_save['config_calibre_dir'] = re.sub(r'[\\/]metadata\.db$',
                                            '',
                                            to_save['config_calibre_dir'],
                                            flags=re.IGNORECASE)
@@ -653,11 +856,15 @@ def _configuration_update_helper():
 
         reboot_required |= _config_string(to_save, "config_keyfile")
         if config.config_keyfile and not os.path.isfile(config.config_keyfile):
-            return _configuration_result(_('Keyfile Location is not Valid, Please Enter Correct Path'), gdriveError)
+            return _configuration_result(_('Keyfile Location is not Valid, Please Enter Correct Path'),
+                                         gdriveError,
+                                         configured)
 
         reboot_required |= _config_string(to_save, "config_certfile")
         if config.config_certfile and not os.path.isfile(config.config_certfile):
-            return _configuration_result(_('Certfile Location is not Valid, Please Enter Correct Path'), gdriveError)
+            return _configuration_result(_('Certfile Location is not Valid, Please Enter Correct Path'),
+                                         gdriveError,
+                                         configured)
 
         _config_checkbox_int(to_save, "config_uploading")
         # Reboot on config_anonbrowse with enabled ldap, as decoraters are changed in this case
@@ -722,10 +929,10 @@ def _configuration_update_helper():
         if "config_rarfile_location" in to_save:
             unrar_status = helper.check_unrar(config.config_rarfile_location)
             if unrar_status:
-                return _configuration_result(unrar_status, gdriveError)
+                return _configuration_result(unrar_status, gdriveError, configured)
     except (OperationalError, InvalidRequestError):
         ub.session.rollback()
-        _configuration_result(_(u"Settings DB is not Writeable"), gdriveError)
+        _configuration_result(_(u"Settings DB is not Writeable"), gdriveError, configured)
 
     try:
         metadata_db = os.path.join(config.config_calibre_dir, "metadata.db")
@@ -733,11 +940,13 @@ def _configuration_update_helper():
             gdriveutils.downloadFile(None, "metadata.db", metadata_db)
             db_change = True
     except Exception as e:
-        return _configuration_result('%s' % e, gdriveError)
+        return _configuration_result('%s' % e, gdriveError, configured)
 
     if db_change:
         if not calibre_db.setup_db(config, ub.app_DB_path):
-            return _configuration_result(_('DB Location is not Valid, Please Enter Correct Path'), gdriveError)
+            return _configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
+                                         gdriveError,
+                                         configured)
         if not os.access(os.path.join(config.config_calibre_dir, "metadata.db"), os.W_OK):
             flash(_(u"DB is not Writeable"), category="warning")
 
@@ -746,10 +955,10 @@ def _configuration_update_helper():
     if reboot_required:
         web_server.stop(True)
 
-    return _configuration_result(None, gdriveError)
+    return _configuration_result(None, gdriveError, configured)
 
 
-def _configuration_result(error_flash=None, gdriveError=None):
+def _configuration_result(error_flash=None, gdriveError=None, configured=True):
     gdrive_authenticate = not is_gdrive_ready()
     gdrivefolders = []
     if gdriveError is None:
@@ -770,7 +979,7 @@ def _configuration_result(error_flash=None, gdriveError=None):
 
     return render_title_template("config_edit.html", config=config, provider=oauthblueprints,
                                  show_back_button=show_back_button, show_login_button=show_login_button,
-                                 show_authenticate_google_drive=gdrive_authenticate,
+                                 show_authenticate_google_drive=gdrive_authenticate, filepicker=configured,
                                  gdriveError=gdriveError, gdrivefolders=gdrivefolders, feature_support=feature_support,
                                  title=_(u"Basic Configuration"), page="config")
 
@@ -816,7 +1025,10 @@ def _handle_new_user(to_save, content,languages, translations, kobo_support):
         content.allowed_column_value = config.config_allowed_column_value
         content.denied_column_value = config.config_denied_column_value
         ub.session.add(content)
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
         flash(_(u"User '%(user)s' created", user=content.nickname), category="success")
         return redirect(url_for('admin.admin'))
     except IntegrityError:
@@ -832,7 +1044,10 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support):
         if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
                                             ub.User.id != content.id).count():
             ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
             flash(_(u"User '%(nick)s' deleted", nick=content.nickname), category="success")
             return redirect(url_for('admin.admin'))
         else:
@@ -855,7 +1070,7 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support):
             content.role &= ~constants.ROLE_ANONYMOUS
 
         val = [int(k[5:]) for k in to_save if k.startswith('show_')]
-        sidebar = ub.get_sidebar_config()
+        sidebar = get_sidebar_config()
         for element in sidebar:
             value = element['visibility']
             if value in val and not content.check_visibility(value):
@@ -907,7 +1122,10 @@ def _handle_edit_user(to_save, content,languages, translations, kobo_support):
         if "kindle_mail" in to_save and to_save["kindle_mail"] != content.kindle_mail:
             content.kindle_mail = to_save["kindle_mail"]
     try:
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
         flash(_(u"User '%(nick)s' updated", nick=content.nickname), category="success")
     except IntegrityError:
         ub.session.rollback()
@@ -1119,3 +1337,110 @@ def get_updater_status():
         except Exception:
             status['status'] = 11
     return json.dumps(status)
+
+
+@admi.route('/import_ldap_users')
+@login_required
+@admin_required
+def import_ldap_users():
+    showtext = {}
+    try:
+        new_users = services.ldap.get_group_members(config.config_ldap_group_name)
+    except (services.ldap.LDAPException, TypeError, AttributeError, KeyError) as e:
+        log.debug_or_exception(e)
+        showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
+        return json.dumps(showtext)
+    if not new_users:
+        log.debug('LDAP empty response')
+        showtext['text'] = _(u'Error: No user returned in response of LDAP server')
+        return json.dumps(showtext)
+
+    imported = 0
+    for username in new_users:
+        user = username.decode('utf-8')
+        if '=' in user:
+            # if member object field is empty take user object as filter
+            if config.config_ldap_member_user_object:
+                query_filter = config.config_ldap_member_user_object
+            else:
+                query_filter = config.config_ldap_user_object
+            try:
+                user_identifier = extract_user_identifier(user, query_filter)
+            except Exception as e:
+                log.warning(e)
+                continue
+        else:
+            user_identifier = user
+            query_filter = None
+        try:
+            user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
+        except AttributeError as e:
+            log.debug_or_exception(e)
+            continue
+        if user_data:
+            user_login_field = extract_dynamic_field_from_filter(user, config.config_ldap_user_object)
+
+            username = user_data[user_login_field][0].decode('utf-8')
+            # check for duplicate username
+            if ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == username.lower()).first():
+                # if ub.session.query(ub.User).filter(ub.User.nickname == username).first():
+                log.warning("LDAP User  %s Already in Database", user_data)
+                continue
+
+            kindlemail = ''
+            if 'mail' in user_data:
+                useremail = user_data['mail'][0].decode('utf-8')
+                if (len(user_data['mail']) > 1):
+                    kindlemail = user_data['mail'][1].decode('utf-8')
+
+            else:
+                log.debug('No Mail Field Found in LDAP Response')
+                useremail = username + '@email.com'
+            # check for duplicate email
+            if ub.session.query(ub.User).filter(func.lower(ub.User.email) == useremail.lower()).first():
+                log.warning("LDAP Email %s Already in Database", user_data)
+                continue
+            content = ub.User()
+            content.nickname = username
+            content.password = ''  # dummy password which will be replaced by ldap one
+            content.email = useremail
+            content.kindle_mail = kindlemail
+            content.role = config.config_default_role
+            content.sidebar_view = config.config_default_show
+            content.allowed_tags = config.config_allowed_tags
+            content.denied_tags = config.config_denied_tags
+            content.allowed_column_value = config.config_allowed_column_value
+            content.denied_column_value = config.config_denied_column_value
+            ub.session.add(content)
+            try:
+                ub.session.commit()
+                imported +=1
+            except Exception as e:
+                log.warning("Failed to create LDAP user: %s - %s", user, e)
+                ub.session.rollback()
+                showtext['text'] = _(u'Failed to Create at Least One LDAP User')
+        else:
+            log.warning("LDAP User: %s Not Found", user)
+            showtext['text'] = _(u'At Least One LDAP User Not Found in Database')
+    if not showtext:
+        showtext['text'] = _(u'{} User Successfully Imported'.format(imported))
+    return json.dumps(showtext)
+
+
+def extract_user_data_from_field(user, field):
+    match = re.search(field + "=([\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
+    if match:
+        return match.group(1)
+    else:
+        raise Exception("Could Not Parse LDAP User: {}".format(user))
+
+def extract_dynamic_field_from_filter(user, filter):
+    match = re.search("([a-zA-Z0-9-]+)=%s", filter, re.IGNORECASE | re.UNICODE)
+    if match:
+        return match.group(1)
+    else:
+        raise Exception("Could Not Parse LDAP Userfield: {}", user)
+
+def extract_user_identifier(user, filter):
+    dynamic_field = extract_dynamic_field_from_filter(user, filter)
+    return extract_user_data_from_field(user, dynamic_field)
diff --git a/cps/cli.py b/cps/cli.py
index c94cb89d..65a4185a 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -45,6 +45,7 @@ parser.add_argument('-v', '--version', action='version', help='Shows version num
                     version=version_info())
 parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
 parser.add_argument('-s', metavar='user:pass', help='Sets specific username to new password')
+parser.add_argument('-f', action='store_true', help='Enables filepicker in unconfigured mode')
 args = parser.parse_args()
 
 if sys.version_info < (3, 0):
@@ -110,3 +111,6 @@ if ipadress:
 
 # handle and check user password argument
 user_password = args.s or None
+
+# Handles enableing of filepicker
+filepicker = args.f or None
diff --git a/cps/comic.py b/cps/comic.py
index 7e3c7d47..a25f9a51 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -18,21 +18,21 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
-import io
 
 from . import logger, isoLanguages
 from .constants import BookMeta
 
-try:
-    from PIL import Image as PILImage
-    use_PIL = True
-except ImportError as e:
-    use_PIL = False
-
 
 log = logger.create()
 
 
+try:
+    from wand.image import Image
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    use_IM = False
+
+
 try:
     from comicapi.comicarchive import ComicArchive, MetaDataStyle
     use_comic_meta = True
@@ -52,20 +52,23 @@ except (ImportError, LookupError) as e:
         use_rarfile = False
     use_comic_meta = False
 
+NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
+COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
+
 def _cover_processing(tmp_file_name, img, extension):
-    if use_PIL:
+    tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
+    if use_IM:
         # convert to jpg because calibre only supports jpg
-        if extension in ('.png',  '.webp'):
-            imgc = PILImage.open(io.BytesIO(img))
-            im = imgc.convert('RGB')
-            tmp_bytesio = io.BytesIO()
-            im.save(tmp_bytesio, format='JPEG')
-            img = tmp_bytesio.getvalue()
+        if extension in NO_JPEG_EXTENSIONS:
+            with Image(filename=tmp_file_name) as imgc:
+                imgc.format = 'jpeg'
+                imgc.transform_colorspace('rgb')
+                imgc.save(tmp_cover_name)
+                return tmp_cover_name
 
     if not img:
         return None
 
-    tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
     with open(tmp_cover_name, 'wb') as f:
         f.write(img)
     return tmp_cover_name
@@ -80,7 +83,7 @@ def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
-                if extension in ('.jpg', '.jpeg', '.png', '.webp'):
+                if extension in COVER_EXTENSIONS:
                     cover_data = archive.getPage(index)
                     break
     else:
@@ -90,7 +93,7 @@ def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
-                    if extension in ('.jpg', '.jpeg', '.png', '.webp'):
+                    if extension in COVER_EXTENSIONS:
                         cover_data = cf.read(name)
                         break
         elif original_file_extension.upper() == '.CBT':
@@ -99,7 +102,7 @@ def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
-                    if extension in ('.jpg', '.jpeg', '.png', '.webp'):
+                    if extension in COVER_EXTENSIONS:
                         cover_data = cf.extractfile(name).read()
                         break
         elif original_file_extension.upper() == '.CBR' and use_rarfile:
@@ -110,7 +113,7 @@ def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
                     ext = os.path.splitext(name)
                     if len(ext) > 1:
                         extension = ext[1].lower()
-                        if extension in ('.jpg', '.jpeg', '.png', '.webp'):
+                        if extension in COVER_EXTENSIONS:
                             cover_data = cf.read(name)
                             break
             except Exception as e:
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 877ad1c2..b1e487f9 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -22,6 +22,7 @@ import os
 import sys
 
 from sqlalchemy import exc, Column, String, Integer, SmallInteger, Boolean, BLOB, JSON
+from sqlalchemy.exc import OperationalError
 from sqlalchemy.ext.declarative import declarative_base
 
 from . import constants, cli, logger, ub
@@ -271,6 +272,14 @@ class _ConfigSQL(object):
         setattr(self, field, new_value)
         return True
 
+    def toDict(self):
+        storage = {}
+        for k, v in self.__dict__.items():
+            if k[0] != '_' or k.endswith("password"):
+                storage[k] = v
+        return storage
+
+
     def load(self):
         '''Load all configuration values from the underlying storage.'''
         s = self._read_from_storage()  # type: _Settings
@@ -295,7 +304,11 @@ class _ConfigSQL(object):
             log.warning("Log path %s not valid, falling back to default", self.config_logfile)
             self.config_logfile = logfile
             self._session.merge(s)
-            self._session.commit()
+            try:
+                self._session.commit()
+            except OperationalError as e:
+                log.error('Database error: %s', e)
+                self._session.rollback()
 
     def save(self):
         '''Apply all configuration values to the underlying storage.'''
@@ -309,7 +322,11 @@ class _ConfigSQL(object):
 
         log.debug("_ConfigSQL updating storage")
         self._session.merge(s)
-        self._session.commit()
+        try:
+            self._session.commit()
+        except OperationalError as e:
+            log.error('Database error: %s', e)
+            self._session.rollback()
         self.load()
 
     def invalidate(self, error=None):
@@ -350,7 +367,10 @@ def _migrate_table(session, orm_class):
                 changed = True
 
     if changed:
-        session.commit()
+        try:
+            session.commit()
+        except OperationalError:
+            session.rollback()
 
 
 def autodetect_calibre_binary():
diff --git a/cps/db.py b/cps/db.py
index f648a794..f30fb609 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -32,9 +32,9 @@ from sqlalchemy.orm import relationship, sessionmaker, scoped_session
 from sqlalchemy.orm.collections import InstrumentedList
 from sqlalchemy.ext.declarative import declarative_base, DeclarativeMeta
 from sqlalchemy.pool import StaticPool
-from flask_login import current_user
 from sqlalchemy.sql.expression import and_, true, false, text, func, or_
 from sqlalchemy.ext.associationproxy import association_proxy
+from flask_login import current_user
 from babel import Locale as LC
 from babel.core import UnknownLocaleError
 from flask_babel import gettext as _
@@ -425,18 +425,19 @@ class CalibreDB():
     # instances alive once they reach the end of their respective scopes
     instances = WeakSet()
 
-    def __init__(self):
+    def __init__(self, expire_on_commit=True):
         """ Initialize a new CalibreDB session
         """
         self.session = None
         if self._init:
-            self.initSession()
+            self.initSession(expire_on_commit)
 
         self.instances.add(self)
 
 
-    def initSession(self):
+    def initSession(self, expire_on_commit=True):
         self.session = self.session_factory()
+        self.session.expire_on_commit = expire_on_commit
         self.update_title_sort(self.config)
 
     @classmethod
@@ -444,6 +445,8 @@ class CalibreDB():
         cls.config = config
         cls.dispose()
 
+        # toDo: if db changed -> delete shelfs, delete download books, delete read boks, kobo sync??
+
         if not config.config_calibre_dir:
             config.invalidate()
             return False
@@ -764,5 +767,5 @@ def lcase(s):
         return unidecode.unidecode(s.lower())
     except Exception as e:
         log = logger.create()
-        log.exception(e)
+        log.debug_or_exception(e)
         return s.lower()
diff --git a/cps/debug_info.py b/cps/debug_info.py
index 75ef3bb8..8f0cdeee 100644
--- a/cps/debug_info.py
+++ b/cps/debug_info.py
@@ -21,7 +21,12 @@ import shutil
 import glob
 import zipfile
 import json
-import io
+from io import BytesIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
 import os
 
 from flask import send_file
@@ -32,11 +37,12 @@ from .about import collect_stats
 log = logger.create()
 
 def assemble_logfiles(file_name):
-    log_list = glob.glob(file_name + '*')
-    wfd = io.StringIO()
+    log_list = sorted(glob.glob(file_name + '*'), reverse=True)
+    wfd = StringIO()
     for f in log_list:
         with open(f, 'r') as fd:
             shutil.copyfileobj(fd, wfd)
+    wfd.seek(0)
     return send_file(wfd,
                      as_attachment=True,
                      attachment_filename=os.path.basename(file_name))
@@ -44,8 +50,12 @@ def assemble_logfiles(file_name):
 def send_debug():
     file_list = glob.glob(logger.get_logfile(config.config_logfile) + '*')
     file_list.extend(glob.glob(logger.get_accesslogfile(config.config_access_logfile) + '*'))
-    memory_zip = io.BytesIO()
+    for element in [logger.LOG_TO_STDOUT, logger.LOG_TO_STDERR]:
+        if element in file_list:
+            file_list.remove(element)
+    memory_zip = BytesIO()
     with zipfile.ZipFile(memory_zip, 'w', compression=zipfile.ZIP_DEFLATED) as zf:
+        zf.writestr('settings.txt', json.dumps(config.toDict()))
         zf.writestr('libs.txt', json.dumps(collect_stats()))
         for fp in file_list:
             zf.write(fp, os.path.basename(fp))
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 7d207ed3..08ee93b1 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -37,13 +37,38 @@ from . import config, get_locale, ub, db
 from . import calibre_db
 from .services.worker import WorkerThread
 from .tasks.upload import TaskUpload
-from .web import login_required_if_no_ano, render_title_template, edit_required, upload_required
+from .render_template import render_title_template
+from .usermanagement import login_required_if_no_ano
+
+try:
+    from functools import wraps
+except ImportError:
+    pass  # We're not using Python 3
 
 
 editbook = Blueprint('editbook', __name__)
 log = logger.create()
 
 
+def upload_required(f):
+    @wraps(f)
+    def inner(*args, **kwargs):
+        if current_user.role_upload() or current_user.role_admin():
+            return f(*args, **kwargs)
+        abort(403)
+
+    return inner
+
+def edit_required(f):
+    @wraps(f)
+    def inner(*args, **kwargs):
+        if current_user.role_edit() or current_user.role_admin():
+            return f(*args, **kwargs)
+        abort(403)
+
+    return inner
+
+
 # Modifies different Database objects, first check if elements have to be added to database, than check
 # if elements have to be deleted, because they are no longer used
 def modify_database_object(input_elements, db_book_object, db_object, db_session, db_type):
@@ -259,7 +284,7 @@ def delete_book(book_id, book_format, jsonResponse):
                         filter(db.Data.format == book_format).delete()
                 calibre_db.session.commit()
             except Exception as e:
-                log.exception(e)
+                log.debug_or_exception(e)
                 calibre_db.session.rollback()
         else:
             # book not found
@@ -287,7 +312,7 @@ def delete_book(book_id, book_format, jsonResponse):
 def render_edit_book(book_id):
     calibre_db.update_title_sort(config)
     cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
-    book = calibre_db.get_filtered_book(book_id)
+    book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
     if not book:
         flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")
         return redirect(url_for("web.index"))
@@ -716,7 +741,7 @@ def edit_book(book_id):
             flash(error, category="error")
             return render_edit_book(book_id)
     except Exception as e:
-        log.exception(e)
+        log.debug_or_exception(e)
         calibre_db.session.rollback()
         flash(_("Error editing book, please check logfile for details"), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
diff --git a/cps/error_handler.py b/cps/error_handler.py
new file mode 100644
index 00000000..e9cb601a
--- /dev/null
+++ b/cps/error_handler.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2018-2020 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import traceback
+from flask import render_template
+from werkzeug.exceptions import default_exceptions
+try:
+    from werkzeug.exceptions import FailedDependency
+except ImportError:
+    from werkzeug.exceptions import UnprocessableEntity as FailedDependency
+
+from . import config, app, logger, services
+
+
+log = logger.create()
+
+# custom error page
+def error_http(error):
+    return render_template('http_error.html',
+                           error_code="Error {0}".format(error.code),
+                           error_name=error.name,
+                           issue=False,
+                           instance=config.config_calibre_web_title
+                           ), error.code
+
+
+def internal_error(error):
+    return render_template('http_error.html',
+                           error_code="Internal Server Error",
+                           error_name=str(error),
+                           issue=True,
+                           error_stack=traceback.format_exc().split("\n"),
+                           instance=config.config_calibre_web_title
+                           ), 500
+
+def init_errorhandler():
+    # http error handling
+    for ex in default_exceptions:
+        if ex < 500:
+            app.register_error_handler(ex, error_http)
+        elif ex == 500:
+            app.register_error_handler(ex, internal_error)
+
+
+    if services.ldap:
+        # Only way of catching the LDAPException upon logging in with LDAP server down
+        @app.errorhandler(services.ldap.LDAPException)
+        def handle_exception(e):
+            log.debug('LDAP server not accessible while trying to login to opds feed')
+            return error_http(FailedDependency())
+
+
+# @app.errorhandler(InvalidRequestError)
+#@app.errorhandler(OperationalError)
+#def handle_db_exception(e):
+#    db.session.rollback()
+#    log.error('Database request error: %s',e)
+#    return internal_error(InternalServerError(e))
diff --git a/cps/gdrive.py b/cps/gdrive.py
index 90b83e64..b1896bbb 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -35,9 +35,9 @@ from flask_babel import gettext as _
 from flask_login import login_required
 
 from . import logger, gdriveutils, config, ub, calibre_db
-from .web import admin_required
+from .admin import admin_required
 
-gdrive = Blueprint('gdrive', __name__)
+gdrive = Blueprint('gdrive', __name__, url_prefix='/gdrive')
 log = logger.create()
 
 try:
@@ -50,7 +50,7 @@ current_milli_time = lambda: int(round(time() * 1000))
 gdrive_watch_callback_token = 'target=calibreweb-watch_files'
 
 
-@gdrive.route("/gdrive/authenticate")
+@gdrive.route("/authenticate")
 @login_required
 @admin_required
 def authenticate_google_drive():
@@ -63,7 +63,7 @@ def authenticate_google_drive():
     return redirect(authUrl)
 
 
-@gdrive.route("/gdrive/callback")
+@gdrive.route("/callback")
 def google_drive_callback():
     auth_code = request.args.get('code')
     if not auth_code:
@@ -77,18 +77,14 @@ def google_drive_callback():
     return redirect(url_for('admin.configuration'))
 
 
-@gdrive.route("/gdrive/watch/subscribe")
+@gdrive.route("/watch/subscribe")
 @login_required
 @admin_required
 def watch_gdrive():
     if not config.config_google_drive_watch_changes_response:
         with open(gdriveutils.CLIENT_SECRETS, 'r') as settings:
             filedata = json.load(settings)
-        if filedata['web']['redirect_uris'][0].endswith('/'):
-            filedata['web']['redirect_uris'][0] = filedata['web']['redirect_uris'][0][:-((len('/gdrive/callback')+1))]
-        else:
-            filedata['web']['redirect_uris'][0] = filedata['web']['redirect_uris'][0][:-(len('/gdrive/callback'))]
-        address = '%s/gdrive/watch/callback' % filedata['web']['redirect_uris'][0]
+        address = filedata['web']['redirect_uris'][0].rstrip('/').replace('/gdrive/callback', '/gdrive/watch/callback')
         notification_id = str(uuid4())
         try:
             result = gdriveutils.watchChange(gdriveutils.Gdrive.Instance().drive, notification_id,
@@ -98,14 +94,15 @@ def watch_gdrive():
         except HttpError as e:
             reason=json.loads(e.content)['error']['errors'][0]
             if reason['reason'] == u'push.webhookUrlUnauthorized':
-                flash(_(u'Callback domain is not verified, please follow steps to verify domain in google developer console'), category="error")
+                flash(_(u'Callback domain is not verified, '
+                        u'please follow steps to verify domain in google developer console'), category="error")
             else:
                 flash(reason['message'], category="error")
 
     return redirect(url_for('admin.configuration'))
 
 
-@gdrive.route("/gdrive/watch/revoke")
+@gdrive.route("/watch/revoke")
 @login_required
 @admin_required
 def revoke_watch_gdrive():
@@ -121,14 +118,14 @@ def revoke_watch_gdrive():
     return redirect(url_for('admin.configuration'))
 
 
-@gdrive.route("/gdrive/watch/callback", methods=['GET', 'POST'])
+@gdrive.route("/watch/callback", methods=['GET', 'POST'])
 def on_received_watch_confirmation():
     if not config.config_google_drive_watch_changes_response:
         return ''
     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'))
+        return ''
 
     log.debug('%r', request.headers)
     log.debug('%r', request.data)
@@ -146,15 +143,18 @@ def on_received_watch_confirmation():
                 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()
+                tmp_dir = os.path.join(tempfile.gettempdir(), 'calibre_web')
+                if not os.path.isdir(tmp_dir):
+                    os.mkdir(tmp_dir)
+
                 log.info('Database file updated')
-                copyfile(dbpath, os.path.join(tmpDir, "metadata.db_" + str(current_milli_time())))
+                copyfile(dbpath, os.path.join(tmp_dir, "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"))
+                gdriveutils.downloadFile(None, "metadata.db", os.path.join(tmp_dir, "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)
+                # prevent error on windows, as os.rename does on existing files, also allow cross hdd move
+                move(os.path.join(tmp_dir, "tmp_metadata.db"), dbpath)
                 calibre_db.reconnect_db(config, ub.app_DB_path)
     except Exception as e:
-        log.exception(e)
+        log.debug_or_exception(e)
     return ''
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 3e00c9af..6f78ab47 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -32,16 +32,25 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.exc import OperationalError, InvalidRequestError
 
 try:
-    from pydrive.auth import GoogleAuth
-    from pydrive.drive import GoogleDrive
-    from pydrive.auth import RefreshError
     from apiclient import errors
     from httplib2 import ServerNotFoundError
-    gdrive_support = True
     importError = None
-except ImportError as err:
-    importError = err
+    gdrive_support = True
+except ImportError as e:
+    importError = e
     gdrive_support = False
+try:
+    from pydrive2.auth import GoogleAuth
+    from pydrive2.drive import GoogleDrive
+    from pydrive2.auth import RefreshError
+except ImportError as err:
+    try:
+        from pydrive.auth import GoogleAuth
+        from pydrive.drive import GoogleDrive
+        from pydrive.auth import RefreshError
+    except ImportError as err:
+        importError = err
+        gdrive_support = False
 
 from . import logger, cli, config
 from .constants import CONFIG_DIR as _CONFIG_DIR
@@ -91,7 +100,7 @@ class Singleton:
         except AttributeError:
             self._instance = self._decorated()
             return self._instance
-        except ImportError as e:
+        except (ImportError, NameError) as e:
             log.debug(e)
             return None
 
@@ -190,7 +199,7 @@ def getDrive(drive=None, gauth=None):
             except RefreshError as e:
                 log.error("Google Drive error: %s", e)
             except Exception as e:
-                log.exception(e)
+                log.debug_or_exception(e)
         else:
             # Initialize the saved creds
             gauth.Authorize()
@@ -208,7 +217,7 @@ def listRootFolders():
         drive = getDrive(Gdrive.Instance().drive)
         folder = "'root' in parents and mimeType = 'application/vnd.google-apps.folder' and trashed = false"
         fileList = drive.ListFile({'q': folder}).GetList()
-    except ServerNotFoundError as e:
+    except (ServerNotFoundError, ssl.SSLError) as e:
         log.info("GDrive Error %s" % e)
         fileList = []
     return fileList
@@ -547,21 +556,24 @@ def partial(total_byte_len, part_size_limit):
     return s
 
 # downloads files in chunks from gdrive
-def do_gdrive_download(df, headers):
+def do_gdrive_download(df, headers, convert_encoding=False):
     total_size = int(df.metadata.get('fileSize'))
     download_url = df.metadata.get('downloadUrl')
     s = partial(total_size, 1024 * 1024)  # I'm downloading BIG files, so 100M chunk size is fine for me
 
-    def stream():
+    def stream(convert_encoding):
         for byte in s:
             headers = {"Range": 'bytes=%s-%s' % (byte[0], byte[1])}
             resp, content = df.auth.Get_Http_Object().request(download_url, headers=headers)
             if resp.status == 206:
+                if convert_encoding:
+                    result = chardet.detect(content)
+                    content = content.decode(result['encoding']).encode('utf-8')
                 yield content
             else:
                 log.warning('An error occurred: %s', resp)
                 return
-    return Response(stream_with_context(stream()), headers=headers)
+    return Response(stream_with_context(stream(convert_encoding)), headers=headers)
 
 
 _SETTINGS_YAML_TEMPLATE = """
diff --git a/cps/helper.py b/cps/helper.py
index 9845df97..506afe71 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -24,10 +24,7 @@ import io
 import mimetypes
 import re
 import shutil
-import glob
 import time
-import zipfile
-import json
 import unicodedata
 from datetime import datetime, timedelta
 from tempfile import gettempdir
@@ -53,13 +50,6 @@ try:
 except ImportError:
     use_unidecode = False
 
-try:
-    from PIL import Image as PILImage
-    from PIL import UnidentifiedImageError
-    use_PIL = True
-except ImportError:
-    use_PIL = False
-
 from . import calibre_db
 from .tasks.convert import TaskConvert
 from . import logger, config, get_locale, db, ub
@@ -69,9 +59,16 @@ from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
 from .tasks.mail import TaskEmail
 
-
 log = logger.create()
 
+try:
+    from wand.image import Image
+    from wand.exceptions import MissingDelegateError
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    log.debug('Cannot import Image, generating covers from non jpg files will not work: %s', e)
+    use_IM = False
+
 
 # Convert existing book entry to new format
 def convert_book_format(book_id, calibrepath, old_book_format, new_book_format, user_id, kindle_mail=None):
@@ -112,21 +109,21 @@ def convert_book_format(book_id, calibrepath, old_book_format, new_book_format,
 def send_test_mail(kindle_mail, user_name):
     WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
                      config.get_mail_settings(), kindle_mail, _(u"Test e-mail"),
-                               _(u'This e-mail has been sent via Calibre-Web.')))
+                                          _(u'This e-mail has been sent via Calibre-Web.')))
     return
 
 
 # Send registration email or password reset email, depending on parameter resend (False means welcome email)
 def send_registration_mail(e_mail, user_name, default_password, resend=False):
-    text = "Hello %s!\r\n" % user_name
+    txt = "Hello %s!\r\n" % user_name
     if not resend:
-        text += "Your new account at Calibre-Web has been created. Thanks for joining us!\r\n"
-    text += "Please log in to your account using the following informations:\r\n"
-    text += "User name: %s\r\n" % user_name
-    text += "Password: %s\r\n" % default_password
-    text += "Don't forget to change your password after first login.\r\n"
-    text += "Sincerely\r\n\r\n"
-    text += "Your Calibre-Web team"
+        txt += "Your new account at Calibre-Web has been created. Thanks for joining us!\r\n"
+    txt += "Please log in to your account using the following informations:\r\n"
+    txt += "User name: %s\r\n" % user_name
+    txt += "Password: %s\r\n" % default_password
+    txt += "Don't forget to change your password after first login.\r\n"
+    txt += "Sincerely\r\n\r\n"
+    txt += "Your Calibre-Web team"
     WorkerThread.add(None, TaskEmail(
         subject=_(u'Get Started with Calibre-Web'),
         filepath=None,
@@ -134,7 +131,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
         settings=config.get_mail_settings(),
         recipient=e_mail,
         taskMessage=_(u"Registration e-mail for user: %(name)s", name=user_name),
-        text=text
+        text=txt
     ))
 
     return
@@ -180,7 +177,7 @@ def check_send_to_kindle(entry):
                                     'convert': 0,
                                     'text': _('Send %(format)s to Kindle', format='Pdf')})
             if config.config_converterpath:
-                if 'EPUB' in formats and not 'MOBI' in formats:
+                if 'EPUB' in formats and 'MOBI' not in formats:
                     bookformats.append({'format': 'Mobi',
                                         'convert':1,
                                         'text': _('Convert %(orig)s to %(format)s and send to Kindle',
@@ -565,8 +562,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                     log.error('%s/cover.jpg not found on Google Drive', book.path)
                     return get_cover_on_failure(use_generic_cover_on_failure)
             except Exception as e:
-                log.exception(e)
-                # traceback.print_exc()
+                log.debug_or_exception(e)
                 return get_cover_on_failure(use_generic_cover_on_failure)
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
@@ -589,16 +585,15 @@ def save_cover_from_url(url, book_path):
             requests.exceptions.Timeout) as ex:
         log.info(u'Cover Download Error %s', ex)
         return False, _("Error Downloading Cover")
-    except UnidentifiedImageError as ex:
+    except MissingDelegateError as ex:
         log.info(u'File Format Error %s', ex)
         return False, _("Cover Format Error")
 
 
 def save_cover_from_filestorage(filepath, saved_filename, img):
-    if hasattr(img, '_content'):
-        f = open(os.path.join(filepath, saved_filename), "wb")
-        f.write(img._content)
-        f.close()
+    if hasattr(img,"metadata"):
+        img.save(filename=os.path.join(filepath, saved_filename))
+        img.close()
     else:
         # check if file path exists, otherwise create it, copy file to calibre path and delete temp file
         if not os.path.exists(filepath):
@@ -619,31 +614,33 @@ def save_cover_from_filestorage(filepath, saved_filename, img):
 def save_cover(img, book_path):
     content_type = img.headers.get('content-type')
 
-    if use_PIL:
-        if content_type not in ('image/jpeg', 'image/png', 'image/webp'):
-            log.error("Only jpg/jpeg/png/webp files are supported as coverfile")
-            return False, _("Only jpg/jpeg/png/webp files are supported as coverfile")
+    if use_IM:
+        if content_type not in ('image/jpeg', 'image/png', 'image/webp', 'image/bmp'):
+            log.error("Only jpg/jpeg/png/webp/bmp files are supported as coverfile")
+            return False, _("Only jpg/jpeg/png/webp/bmp files are supported as coverfile")
         # convert to jpg because calibre only supports jpg
-        if content_type in ('image/png', 'image/webp'):
+        if content_type != 'image/jpg':
             if hasattr(img, 'stream'):
-                imgc = PILImage.open(img.stream)
+                imgc = Image(blob=img.stream)
             else:
-                imgc = PILImage.open(io.BytesIO(img.content))
-            im = imgc.convert('RGB')
-            tmp_bytesio = io.BytesIO()
-            im.save(tmp_bytesio, format='JPEG')
-            img._content = tmp_bytesio.getvalue()
+                imgc = Image(blob=io.BytesIO(img.content))
+            imgc.format = 'jpeg'
+            imgc.transform_colorspace("rgb")
+            img = imgc
     else:
         if content_type not in 'image/jpeg':
             log.error("Only jpg/jpeg files are supported as coverfile")
             return False, _("Only jpg/jpeg files are supported as coverfile")
 
     if config.config_use_google_drive:
-        tmpDir = gettempdir()
-        ret, message = save_cover_from_filestorage(tmpDir, "uploaded_cover.jpg", img)
+        tmp_dir = os.path.join(gettempdir(), 'calibre_web')
+
+        if not os.path.isdir(tmp_dir):
+            os.mkdir(tmp_dir)
+        ret, message = save_cover_from_filestorage(tmp_dir, "uploaded_cover.jpg", img)
         if ret is True:
-            gd.uploadFileToEbooksFolder(os.path.join(book_path, 'cover.jpg'),
-                                        os.path.join(tmpDir, "uploaded_cover.jpg"))
+            gd.uploadFileToEbooksFolder(os.path.join(book_path, 'cover.jpg').replace("\\","/"),
+                                        os.path.join(tmp_dir, "uploaded_cover.jpg"))
             log.info("Cover is saved on Google Drive")
             return True, None
         else:
@@ -697,7 +694,7 @@ def check_unrar(unrarLocation):
                 log.debug("unrar version %s", version)
                 break
     except (OSError, UnicodeDecodeError) as err:
-        log.exception(err)
+        log.debug_or_exception(err)
         return _('Error excecuting UnRar')
 
 
@@ -827,4 +824,3 @@ def get_download_link(book_id, book_format, client):
         return do_download_file(book, book_format, client, data1, headers)
     else:
         abort(404)
-
diff --git a/cps/kobo.py b/cps/kobo.py
index a9c0f936..029592fe 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -43,6 +43,8 @@ from flask_login import current_user
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
 from sqlalchemy.sql.expression import and_, or_
+from sqlalchemy.exc import OperationalError
+from sqlalchemy.orm import load_only
 from sqlalchemy.exc import StatementError
 import requests
 
@@ -56,6 +58,8 @@ KOBO_FORMATS = {"KEPUB": ["KEPUB"], "EPUB": ["EPUB3", "EPUB"]}
 KOBO_STOREAPI_URL = "https://storeapi.kobo.com"
 KOBO_IMAGEHOST_URL = "https://kbimages1-a.akamaihd.net"
 
+SYNC_ITEM_LIMIT = 5
+
 kobo = Blueprint("kobo", __name__, url_prefix="/kobo/<auth_token>")
 kobo_auth.disable_failed_auth_redirect_for_blueprint(kobo)
 kobo_auth.register_url_value_preprocessor(kobo)
@@ -142,68 +146,80 @@ def HandleSyncRequest():
     new_books_last_modified = sync_token.books_last_modified
     new_books_last_created = sync_token.books_last_created
     new_reading_state_last_modified = sync_token.reading_state_last_modified
+    new_archived_last_modified = datetime.datetime.min
     sync_results = []
 
     # We reload the book database so that the user get's a fresh view of the library
     # in case of external changes (e.g: adding a book through Calibre).
     calibre_db.reconnect_db(config, ub.app_DB_path)
 
-    archived_books = (
-        ub.session.query(ub.ArchivedBook)
-        .filter(ub.ArchivedBook.user_id == int(current_user.id))
-        .all()
-    )
-
-    # We join-in books that have had their Archived bit recently modified in order to either:
-    #   * Restore them to the user's device.
-    #   * Delete them from the user's device.
-    # (Ideally we would use a join for this logic, however cross-database joins don't look trivial in SqlAlchemy.)
-    recently_restored_or_archived_books = []
-    archived_book_ids = {}
-    new_archived_last_modified = datetime.datetime.min
-    for archived_book in archived_books:
-        if archived_book.last_modified > sync_token.archive_last_modified:
-            recently_restored_or_archived_books.append(archived_book.book_id)
-        if archived_book.is_archived:
-            archived_book_ids[archived_book.book_id] = True
-        new_archived_last_modified = max(
-            new_archived_last_modified, archived_book.last_modified)
-
-    # sqlite gives unexpected results when performing the last_modified comparison without the datetime cast.
-    # It looks like it's treating the db.Books.last_modified field as a string and may fail
-    # the comparison because of the +00:00 suffix.
-    changed_entries = (
-        calibre_db.session.query(db.Books)
-        .join(db.Data)
-        .filter(or_(func.datetime(db.Books.last_modified) > sync_token.books_last_modified,
-                    db.Books.id.in_(recently_restored_or_archived_books)))
-        .filter(db.Data.format.in_(KOBO_FORMATS))
-        .all()
-    )
+    if sync_token.books_last_id > -1:
+        changed_entries = (
+            calibre_db.session.query(db.Books, ub.ArchivedBook.last_modified, ub.ArchivedBook.is_archived)
+            .join(db.Data).outerjoin(ub.ArchivedBook, db.Books.id == ub.ArchivedBook.book_id)
+            .filter(db.Books.last_modified >= sync_token.books_last_modified)
+            .filter(db.Books.id>sync_token.books_last_id)
+            .filter(db.Data.format.in_(KOBO_FORMATS))
+            .order_by(db.Books.last_modified)
+            .order_by(db.Books.id)
+            .limit(SYNC_ITEM_LIMIT)
+        )
+    else:
+        changed_entries = (
+            calibre_db.session.query(db.Books, ub.ArchivedBook.last_modified, ub.ArchivedBook.is_archived)
+            .join(db.Data).outerjoin(ub.ArchivedBook, db.Books.id == ub.ArchivedBook.book_id)
+            .filter(db.Books.last_modified > sync_token.books_last_modified)
+            .filter(db.Data.format.in_(KOBO_FORMATS))
+            .order_by(db.Books.last_modified)
+            .order_by(db.Books.id)
+            .limit(SYNC_ITEM_LIMIT)
+        )
 
     reading_states_in_new_entitlements = []
     for book in changed_entries:
-        kobo_reading_state = get_or_create_reading_state(book.id)
+        kobo_reading_state = get_or_create_reading_state(book.Books.id)
         entitlement = {
-            "BookEntitlement": create_book_entitlement(book, archived=(book.id in archived_book_ids)),
-            "BookMetadata": get_metadata(book),
+            "BookEntitlement": create_book_entitlement(book.Books, archived=(book.is_archived == True)),
+            "BookMetadata": get_metadata(book.Books),
         }
 
         if kobo_reading_state.last_modified > sync_token.reading_state_last_modified:
-            entitlement["ReadingState"] = get_kobo_reading_state_response(book, kobo_reading_state)
+            entitlement["ReadingState"] = get_kobo_reading_state_response(book.Books, kobo_reading_state)
             new_reading_state_last_modified = max(new_reading_state_last_modified, kobo_reading_state.last_modified)
-            reading_states_in_new_entitlements.append(book.id)
+            reading_states_in_new_entitlements.append(book.Books.id)
 
-        if book.timestamp > sync_token.books_last_created:
+        if book.Books.timestamp > sync_token.books_last_created:
             sync_results.append({"NewEntitlement": entitlement})
         else:
             sync_results.append({"ChangedEntitlement": entitlement})
 
         new_books_last_modified = max(
-            book.last_modified, new_books_last_modified
+            book.Books.last_modified, new_books_last_modified
         )
-        new_books_last_created = max(book.timestamp, new_books_last_created)
+        new_books_last_created = max(book.Books.timestamp, new_books_last_created)
 
+    max_change = (changed_entries
+        .from_self()
+        .filter(ub.ArchivedBook.is_archived)
+        .order_by(func.datetime(ub.ArchivedBook.last_modified).desc())
+        .first()
+    )
+    if max_change:
+        max_change = max_change.last_modified
+    else:
+        max_change = new_archived_last_modified
+    new_archived_last_modified = max(new_archived_last_modified, max_change)
+
+    # no. of books returned
+    book_count = changed_entries.count()
+
+    # last entry:
+    if book_count:
+        books_last_id = changed_entries.all()[-1].Books.id or -1
+    else:
+        books_last_id = -1
+
+    # generate reading state data
     changed_reading_states = (
         ub.session.query(ub.KoboReadingState)
         .filter(and_(func.datetime(ub.KoboReadingState.last_modified) > sync_token.reading_state_last_modified,
@@ -225,11 +241,12 @@ def HandleSyncRequest():
     sync_token.books_last_modified = new_books_last_modified
     sync_token.archive_last_modified = new_archived_last_modified
     sync_token.reading_state_last_modified = new_reading_state_last_modified
+    sync_token.books_last_id = books_last_id
 
-    return generate_sync_response(sync_token, sync_results)
+    return generate_sync_response(sync_token, sync_results, book_count)
 
 
-def generate_sync_response(sync_token, sync_results):
+def generate_sync_response(sync_token, sync_results, set_cont=False):
     extra_headers = {}
     if config.config_kobo_proxy:
         # Merge in sync results from the official Kobo store.
@@ -245,6 +262,8 @@ def generate_sync_response(sync_token, sync_results):
 
         except Exception as e:
             log.error("Failed to receive or parse response from Kobo's sync endpoint: " + str(e))
+    if set_cont:
+        extra_headers["x-kobo-sync"] = "continue"
     sync_token.to_headers(extra_headers)
 
     response = make_response(jsonify(sync_results), extra_headers)
@@ -443,8 +462,10 @@ def HandleTagCreate():
     items_unknown_to_calibre = add_items_to_shelf(items, shelf)
     if items_unknown_to_calibre:
         log.debug("Received request to add unknown books to a collection. Silently ignoring items.")
-    ub.session.commit()
-
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
     return make_response(jsonify(str(shelf.uuid)), 201)
 
 
@@ -476,7 +497,10 @@ def HandleTagUpdate(tag_id):
 
         shelf.name = name
         ub.session.merge(shelf)
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
     return make_response(' ', 200)
 
 
@@ -528,7 +552,10 @@ def HandleTagAddItem(tag_id):
         log.debug("Received request to add an unknown book to a collection. Silently ignoring item.")
 
     ub.session.merge(shelf)
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
 
     return make_response('', 201)
 
@@ -569,7 +596,10 @@ def HandleTagRemoveItem(tag_id):
             shelf.books.filter(ub.BookShelf.book_id == book.id).delete()
         except KeyError:
             items_unknown_to_calibre.append(item)
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
 
     if items_unknown_to_calibre:
         log.debug("Received request to remove an unknown book to a collecition. Silently ignoring item.")
@@ -615,7 +645,10 @@ def sync_shelves(sync_token, sync_results):
                 "ChangedTag": tag
             })
     sync_token.tags_last_modified = new_tags_last_modified
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
 
 
 # Creates a Kobo "Tag" object from a ub.Shelf object
@@ -696,7 +729,10 @@ def HandleStateRequest(book_uuid):
             abort(400, description="Malformed request data is missing 'ReadingStates' key")
 
         ub.session.merge(kobo_reading_state)
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
         return jsonify({
             "RequestResult": "Success",
             "UpdateResults": [update_results_response],
@@ -734,7 +770,10 @@ def get_or_create_reading_state(book_id):
         kobo_reading_state.statistics = ub.KoboStatistics()
         book_read.kobo_reading_state = kobo_reading_state
     ub.session.add(book_read)
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
     return book_read.kobo_reading_state
 
 
@@ -837,7 +876,10 @@ def HandleBookDeletionRequest(book_uuid):
     archived_book.last_modified = datetime.datetime.utcnow()
 
     ub.session.merge(archived_book)
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
 
     return ("", 204)
 
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 0f6cd174..3288bb73 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -66,9 +66,10 @@ from os import urandom
 from flask import g, Blueprint, url_for, abort, request
 from flask_login import login_user, login_required
 from flask_babel import gettext as _
+from sqlalchemy.exc import OperationalError
 
 from . import logger, ub, lm
-from .web import render_title_template
+from .render_template import render_title_template
 
 try:
     from functools import wraps
@@ -147,7 +148,10 @@ def generate_auth_token(user_id):
             auth_token.token_type = 1
 
             ub.session.add(auth_token)
-            ub.session.commit()
+            try:
+                ub.session.commit()
+            except OperationalError:
+                ub.session.rollback()
         return render_title_template(
             "generate_kobo_auth_url.html",
             title=_(u"Kobo Setup"),
@@ -164,5 +168,8 @@ def delete_auth_token(user_id):
     # Invalidate any prevously generated Kobo Auth token for this user.
     ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == user_id)\
         .filter(ub.RemoteAuthToken.token_type==1).delete()
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
     return ""
diff --git a/cps/logger.py b/cps/logger.py
index 7cc0f4d9..a9606cb1 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -41,10 +41,18 @@ logging.addLevelName(logging.WARNING, "WARN")
 logging.addLevelName(logging.CRITICAL, "CRIT")
 
 
+class _Logger(logging.Logger):
+
+    def debug_or_exception(self, message, *args, **kwargs):
+        if is_debug_enabled():
+            self.exception(message, stacklevel=2, *args, **kwargs)
+        else:
+            self.error(message, stacklevel=2, *args, **kwargs)
+
+
 def get(name=None):
     return logging.getLogger(name)
 
-
 def create():
     parent_frame = inspect.stack(0)[1]
     if hasattr(parent_frame, 'frame'):
@@ -54,7 +62,6 @@ def create():
     parent_module = inspect.getmodule(parent_frame)
     return get(parent_module.__name__)
 
-
 def is_debug_enabled():
     return logging.root.level <= logging.DEBUG
 
@@ -99,6 +106,7 @@ def setup(log_file, log_level=None):
     May be called multiple times.
     '''
     log_level = log_level or DEFAULT_LOG_LEVEL
+    logging.setLoggerClass(_Logger)
     logging.getLogger(__package__).setLevel(log_level)
 
     r = logging.root
diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py
index 4d489cdd..cafef3eb 100644
--- a/cps/oauth_bb.py
+++ b/cps/oauth_bb.py
@@ -30,11 +30,12 @@ from flask_babel import gettext as _
 from flask_dance.consumer import oauth_authorized, oauth_error
 from flask_dance.contrib.github import make_github_blueprint, github
 from flask_dance.contrib.google import make_google_blueprint, google
-from flask_login import login_user, current_user
+from flask_login import login_user, current_user, login_required
 from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import OperationalError
 
 from . import constants, logger, config, app, ub
-from .web import login_required
+
 from .oauth import OAuthBackend, backend_resultcode
 
 
@@ -87,7 +88,7 @@ def register_user_with_oauth(user=None):
             try:
                 ub.session.commit()
             except Exception as e:
-                log.exception(e)
+                log.debug_or_exception(e)
                 ub.session.rollback()
 
 
@@ -109,7 +110,10 @@ if ub.oauth_support:
         oauthProvider.provider_name = "google"
         oauthProvider.active = False
         ub.session.add(oauthProvider)
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
 
     oauth_ids = ub.session.query(ub.OAuthProvider).all()
     ele1 = dict(provider_name='github',
@@ -203,7 +207,7 @@ if ub.oauth_support:
             ub.session.add(oauth_entry)
             ub.session.commit()
         except Exception as e:
-            log.exception(e)
+            log.debug_or_exception(e)
             ub.session.rollback()
 
         # Disable Flask-Dance's default behavior for saving the OAuth token
@@ -235,7 +239,7 @@ if ub.oauth_support:
                         flash(_(u"Link to %(oauth)s Succeeded", oauth=provider_name), category="success")
                         return redirect(url_for('web.profile'))
                     except Exception as e:
-                        log.exception(e)
+                        log.debug_or_exception(e)
                         ub.session.rollback()
                 else:
                     flash(_(u"Login failed, No User Linked With OAuth Account"), category="error")
@@ -282,7 +286,7 @@ if ub.oauth_support:
                     logout_oauth_user()
                     flash(_(u"Unlink to %(oauth)s Succeeded", oauth=oauth_check[provider]), category="success")
                 except Exception as e:
-                    log.exception(e)
+                    log.debug_or_exception(e)
                     ub.session.rollback()
                     flash(_(u"Unlink to %(oauth)s Failed", oauth=oauth_check[provider]), category="error")
         except NoResultFound:
diff --git a/cps/opds.py b/cps/opds.py
index 05e9c68c..1ae7010c 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -33,7 +33,8 @@ from werkzeug.security import check_password_hash
 from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages
 from .helper import get_download_link, get_book_cover
 from .pagination import Pagination
-from .web import render_read_books, download_required, load_user_from_request
+from .web import render_read_books
+from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
 from babel import Locale as LC
 from babel.core import UnknownLocaleError
diff --git a/cps/remotelogin.py b/cps/remotelogin.py
new file mode 100644
index 00000000..a448e5fc
--- /dev/null
+++ b/cps/remotelogin.py
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2018-2019 OzzieIsaacs, cervinko, jkrehm, bodybybuddha, ok11,
+#                            andy29485, idalin, Kyosfonica, wuqi, Kennyl, lemmsh,
+#                            falgh1, grunjol, csitko, ytils, xybydy, trasba, vrabe,
+#                            ruben-herold, marblepebble, JackED42, SiphonSquirrel,
+#                            apetresc, nanu-c, mutschler
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import json
+from datetime import datetime
+
+from flask import Blueprint, request, make_response, abort, url_for, flash, redirect
+from flask_login import login_required, current_user, login_user
+from flask_babel import gettext as _
+from sqlalchemy.sql.expression import true
+
+from . import config, logger, ub
+from .render_template import render_title_template
+
+try:
+    from functools import wraps
+except ImportError:
+    pass  # We're not using Python 3
+
+remotelogin = Blueprint('remotelogin', __name__)
+log = logger.create()
+
+
+def remote_login_required(f):
+    @wraps(f)
+    def inner(*args, **kwargs):
+        if config.config_remote_login:
+            return f(*args, **kwargs)
+        if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
+            data = {'status': 'error', 'message': 'Forbidden'}
+            response = make_response(json.dumps(data, ensure_ascii=False))
+            response.headers["Content-Type"] = "application/json; charset=utf-8"
+            return response, 403
+        abort(403)
+
+    return inner
+
+@remotelogin.route('/remote/login')
+@remote_login_required
+def remote_login():
+    auth_token = ub.RemoteAuthToken()
+    ub.session.add(auth_token)
+    ub.session.commit()
+
+    verify_url = url_for('remotelogin.verify_token', token=auth_token.auth_token, _external=true)
+    log.debug(u"Remot Login request with token: %s", auth_token.auth_token)
+    return render_title_template('remote_login.html', title=_(u"login"), token=auth_token.auth_token,
+                                 verify_url=verify_url, page="remotelogin")
+
+
+@remotelogin.route('/verify/<token>')
+@remote_login_required
+@login_required
+def verify_token(token):
+    auth_token = ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.auth_token == token).first()
+
+    # Token not found
+    if auth_token is None:
+        flash(_(u"Token not found"), category="error")
+        log.error(u"Remote Login token not found")
+        return redirect(url_for('web.index'))
+
+    # Token expired
+    if datetime.now() > auth_token.expiration:
+        ub.session.delete(auth_token)
+        ub.session.commit()
+
+        flash(_(u"Token has expired"), category="error")
+        log.error(u"Remote Login token expired")
+        return redirect(url_for('web.index'))
+
+    # Update token with user information
+    auth_token.user_id = current_user.id
+    auth_token.verified = True
+    ub.session.commit()
+
+    flash(_(u"Success! Please return to your device"), category="success")
+    log.debug(u"Remote Login token for userid %s verified", auth_token.user_id)
+    return redirect(url_for('web.index'))
+
+
+@remotelogin.route('/ajax/verify_token', methods=['POST'])
+@remote_login_required
+def token_verified():
+    token = request.form['token']
+    auth_token = ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.auth_token == token).first()
+
+    data = {}
+
+    # Token not found
+    if auth_token is None:
+        data['status'] = 'error'
+        data['message'] = _(u"Token not found")
+
+    # Token expired
+    elif datetime.now() > auth_token.expiration:
+        ub.session.delete(auth_token)
+        ub.session.commit()
+
+        data['status'] = 'error'
+        data['message'] = _(u"Token has expired")
+
+    elif not auth_token.verified:
+        data['status'] = 'not_verified'
+
+    else:
+        user = ub.session.query(ub.User).filter(ub.User.id == auth_token.user_id).first()
+        login_user(user)
+
+        ub.session.delete(auth_token)
+        ub.session.commit()
+
+        data['status'] = 'success'
+        log.debug(u"Remote Login for userid %s succeded", user.id)
+        flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
+
+    response = make_response(json.dumps(data, ensure_ascii=False))
+    response.headers["Content-Type"] = "application/json; charset=utf-8"
+
+    return response
diff --git a/cps/render_template.py b/cps/render_template.py
new file mode 100644
index 00000000..16fdab13
--- /dev/null
+++ b/cps/render_template.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2018-2020 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from flask import render_template
+from flask_babel import gettext as _
+from flask import g
+from werkzeug.local import LocalProxy
+from flask_login import current_user
+
+from . import config, constants, ub, logger, db, calibre_db
+from .ub import User
+
+
+log = logger.create()
+
+def get_sidebar_config(kwargs=None):
+    kwargs = kwargs or []
+    if 'content' in kwargs:
+        content = kwargs['content']
+        content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()
+    else:
+        content = 'conf' in kwargs
+    sidebar = list()
+    sidebar.append({"glyph": "glyphicon-book", "text": _('Recently Added'), "link": 'web.index', "id": "new",
+                    "visibility": constants.SIDEBAR_RECENT, 'public': True, "page": "root",
+                    "show_text": _('Show recent books'), "config_show":False})
+    sidebar.append({"glyph": "glyphicon-fire", "text": _('Hot Books'), "link": 'web.books_list', "id": "hot",
+                    "visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot",
+                    "show_text": _('Show Hot Books'), "config_show": True})
+    sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.books_list',
+                    "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not g.user.is_anonymous),
+                    "page": "download", "show_text": _('Show Downloaded Books'),
+                    "config_show": content})
+    sidebar.append(
+        {"glyph": "glyphicon-star", "text": _('Top Rated Books'), "link": 'web.books_list', "id": "rated",
+         "visibility": constants.SIDEBAR_BEST_RATED, 'public': True, "page": "rated",
+         "show_text": _('Show Top Rated Books'), "config_show": True})
+    sidebar.append({"glyph": "glyphicon-eye-open", "text": _('Read Books'), "link": 'web.books_list', "id": "read",
+                    "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous),
+                    "page": "read", "show_text": _('Show read and unread'), "config_show": content})
+    sidebar.append(
+        {"glyph": "glyphicon-eye-close", "text": _('Unread Books'), "link": 'web.books_list', "id": "unread",
+         "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous), "page": "unread",
+         "show_text": _('Show unread'), "config_show": False})
+    sidebar.append({"glyph": "glyphicon-random", "text": _('Discover'), "link": 'web.books_list', "id": "rand",
+                    "visibility": constants.SIDEBAR_RANDOM, 'public': True, "page": "discover",
+                    "show_text": _('Show random books'), "config_show": True})
+    sidebar.append({"glyph": "glyphicon-inbox", "text": _('Categories'), "link": 'web.category_list', "id": "cat",
+                    "visibility": constants.SIDEBAR_CATEGORY, 'public': True, "page": "category",
+                    "show_text": _('Show category selection'), "config_show": True})
+    sidebar.append({"glyph": "glyphicon-bookmark", "text": _('Series'), "link": 'web.series_list', "id": "serie",
+                    "visibility": constants.SIDEBAR_SERIES, 'public': True, "page": "series",
+                    "show_text": _('Show series selection'), "config_show": True})
+    sidebar.append({"glyph": "glyphicon-user", "text": _('Authors'), "link": 'web.author_list', "id": "author",
+                    "visibility": constants.SIDEBAR_AUTHOR, 'public': True, "page": "author",
+                    "show_text": _('Show author selection'), "config_show": True})
+    sidebar.append(
+        {"glyph": "glyphicon-text-size", "text": _('Publishers'), "link": 'web.publisher_list', "id": "publisher",
+         "visibility": constants.SIDEBAR_PUBLISHER, 'public': True, "page": "publisher",
+         "show_text": _('Show publisher selection'), "config_show":True})
+    sidebar.append({"glyph": "glyphicon-flag", "text": _('Languages'), "link": 'web.language_overview', "id": "lang",
+                    "visibility": constants.SIDEBAR_LANGUAGE, 'public': (g.user.filter_language() == 'all'),
+                    "page": "language",
+                    "show_text": _('Show language selection'), "config_show": True})
+    sidebar.append({"glyph": "glyphicon-star-empty", "text": _('Ratings'), "link": 'web.ratings_list', "id": "rate",
+                    "visibility": constants.SIDEBAR_RATING, 'public': True,
+                    "page": "rating", "show_text": _('Show ratings selection'), "config_show": True})
+    sidebar.append({"glyph": "glyphicon-file", "text": _('File formats'), "link": 'web.formats_list', "id": "format",
+                    "visibility": constants.SIDEBAR_FORMAT, 'public': True,
+                    "page": "format", "show_text": _('Show file formats selection'), "config_show": True})
+    sidebar.append(
+        {"glyph": "glyphicon-trash", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
+         "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not g.user.is_anonymous), "page": "archived",
+         "show_text": _('Show archived books'), "config_show": content})
+    sidebar.append(
+        {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
+         "visibility": constants.SIDEBAR_LIST, 'public': (not g.user.is_anonymous), "page": "list",
+         "show_text": _('Show Books List'), "config_show": content})
+
+    return sidebar
+
+def get_readbooks_ids():
+    if not config.config_read_column:
+        readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id))\
+            .filter(ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED).all()
+        return frozenset([x.book_id for x in readBooks])
+    else:
+        try:
+            readBooks = calibre_db.session.query(db.cc_classes[config.config_read_column])\
+                .filter(db.cc_classes[config.config_read_column].value == True).all()
+            return frozenset([x.book for x in readBooks])
+        except (KeyError, AttributeError):
+            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            return []
+
+# Returns the template for rendering and includes the instance name
+def render_title_template(*args, **kwargs):
+    sidebar = get_sidebar_config(kwargs)
+    return render_template(instance=config.config_calibre_web_title, sidebar=sidebar,
+                           accept=constants.EXTENSIONS_UPLOAD, read_book_ids=get_readbooks_ids(),
+                           *args, **kwargs)
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index f6db960b..26eb396c 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -85,6 +85,7 @@ class SyncToken:
             "archive_last_modified": {"type": "string"},
             "reading_state_last_modified": {"type": "string"},
             "tags_last_modified": {"type": "string"},
+            "books_last_id": {"type": "integer", "optional": True}
         },
     }
 
@@ -96,6 +97,7 @@ class SyncToken:
         archive_last_modified=datetime.min,
         reading_state_last_modified=datetime.min,
         tags_last_modified=datetime.min,
+        books_last_id=-1
     ):
         self.raw_kobo_store_token = raw_kobo_store_token
         self.books_last_created = books_last_created
@@ -103,6 +105,7 @@ class SyncToken:
         self.archive_last_modified = archive_last_modified
         self.reading_state_last_modified = reading_state_last_modified
         self.tags_last_modified = tags_last_modified
+        self.books_last_id = books_last_id
 
     @staticmethod
     def from_headers(headers):
@@ -137,9 +140,12 @@ class SyncToken:
             archive_last_modified = get_datetime_from_json(data_json, "archive_last_modified")
             reading_state_last_modified = get_datetime_from_json(data_json, "reading_state_last_modified")
             tags_last_modified = get_datetime_from_json(data_json, "tags_last_modified")
+            books_last_id = data_json["books_last_id"]
         except TypeError:
             log.error("SyncToken timestamps don't parse to a datetime.")
             return SyncToken(raw_kobo_store_token=raw_kobo_store_token)
+        except KeyError:
+            books_last_id = -1
 
         return SyncToken(
             raw_kobo_store_token=raw_kobo_store_token,
@@ -147,7 +153,8 @@ class SyncToken:
             books_last_modified=books_last_modified,
             archive_last_modified=archive_last_modified,
             reading_state_last_modified=reading_state_last_modified,
-            tags_last_modified=tags_last_modified
+            tags_last_modified=tags_last_modified,
+            books_last_id=books_last_id
         )
 
     def set_kobo_store_header(self, store_headers):
@@ -170,7 +177,8 @@ class SyncToken:
                 "books_last_created": to_epoch_timestamp(self.books_last_created),
                 "archive_last_modified": to_epoch_timestamp(self.archive_last_modified),
                 "reading_state_last_modified": to_epoch_timestamp(self.reading_state_last_modified),
-                "tags_last_modified": to_epoch_timestamp(self.tags_last_modified)
+                "tags_last_modified": to_epoch_timestamp(self.tags_last_modified),
+                "books_last_id":self.books_last_id
             },
         }
         return b64encode_json(token)
diff --git a/cps/services/worker.py b/cps/services/worker.py
index c2ea594c..072674a0 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -110,7 +110,7 @@ class WorkerThread(threading.Thread):
                 # We don't use a daemon here because we don't want the tasks to just be abruptly halted, leading to
                 # possible file / database corruption
                 item = self.queue.get(timeout=1)
-            except queue.Empty as ex:
+            except queue.Empty:
                 time.sleep(1)
                 continue
 
@@ -161,7 +161,7 @@ class CalibreTask:
             self.run(*args)
         except Exception as e:
             self._handleError(str(e))
-            log.exception(e)
+            log.debug_or_exception(e)
 
         self.end_time = datetime.now()
 
@@ -210,7 +210,6 @@ class CalibreTask:
         self._progress = x
 
     def _handleError(self, error_message):
-        log.exception(error_message)
         self.stat = STAT_FAIL
         self.progress = 1
         self.error = error_message
diff --git a/cps/shelf.py b/cps/shelf.py
index ea7f1eeb..6dae333c 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -22,6 +22,7 @@
 
 from __future__ import division, print_function, unicode_literals
 from datetime import datetime
+import sys
 
 from flask import Blueprint, request, flash, redirect, url_for
 from flask_babel import gettext as _
@@ -29,8 +30,9 @@ from flask_login import login_required, current_user
 from sqlalchemy.sql.expression import func
 from sqlalchemy.exc import OperationalError, InvalidRequestError
 
-from . import logger, ub, calibre_db
-from .web import login_required_if_no_ano, render_title_template
+from . import logger, ub, calibre_db, db
+from .render_template import render_title_template
+from .usermanagement import login_required_if_no_ano
 
 
 shelf = Blueprint('shelf', __name__)
@@ -138,18 +140,14 @@ def search_to_shelf(shelf_id):
             books_for_shelf = ub.searched_ids[current_user.id]
 
         if not books_for_shelf:
-            log.error("Books are already part of %s", shelf)
+            log.error("Books are already part of %s", shelf.name)
             flash(_(u"Books are already part of the shelf: %(name)s", name=shelf.name), category="error")
             return redirect(url_for('web.index'))
 
-        maxOrder = ub.session.query(func.max(ub.BookShelf.order)).filter(ub.BookShelf.shelf == shelf_id).first()
-        if maxOrder[0] is None:
-            maxOrder = 0
-        else:
-            maxOrder = maxOrder[0]
+        maxOrder = ub.session.query(func.max(ub.BookShelf.order)).filter(ub.BookShelf.shelf == shelf_id).first()[0] or 0
 
         for book in books_for_shelf:
-            maxOrder = maxOrder + 1
+            maxOrder += 1
             shelf.books.append(ub.BookShelf(shelf=shelf.id, book_id=book, order=maxOrder))
         shelf.last_modified = datetime.utcnow()
         try:
@@ -322,8 +320,11 @@ def delete_shelf_helper(cur_shelf):
     ub.session.delete(cur_shelf)
     ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
     ub.session.add(ub.ShelfArchive(uuid=cur_shelf.uuid, user_id=cur_shelf.user_id))
-    ub.session.commit()
-    log.info("successfully deleted %s", cur_shelf)
+    try:
+        ub.session.commit()
+        log.info("successfully deleted %s", cur_shelf)
+    except OperationalError:
+        ub.session.rollback()
 
 
 
@@ -333,44 +334,22 @@ def delete_shelf(shelf_id):
     cur_shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     try:
         delete_shelf_helper(cur_shelf)
-    except (OperationalError, InvalidRequestError):
+    except InvalidRequestError:
         ub.session.rollback()
         flash(_(u"Settings DB is not Writeable"), category="error")
     return redirect(url_for('web.index'))
 
-
-@shelf.route("/shelf/<int:shelf_id>", defaults={'shelf_type': 1})
-@shelf.route("/shelf/<int:shelf_id>/<int:shelf_type>")
+@shelf.route("/simpleshelf/<int:shelf_id>")
 @login_required_if_no_ano
-def show_shelf(shelf_type, shelf_id):
-    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
+def show_simpleshelf(shelf_id):
+    return render_show_shelf(2, shelf_id, 1, None)
 
-    result = list()
-    # user is allowed to access shelf
-    if shelf and check_shelf_view_permissions(shelf):
-        page = "shelf.html" if shelf_type == 1 else 'shelfdown.html'
-
-        books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id)\
-            .order_by(ub.BookShelf.order.asc()).all()
-        for book in books_in_shelf:
-            cur_book = calibre_db.get_filtered_book(book.book_id)
-            if cur_book:
-                result.append(cur_book)
-            else:
-                cur_book = calibre_db.get_book(book.book_id)
-                if not cur_book:
-                    log.info('Not existing book %s in %s deleted', book.book_id, shelf)
-                    try:
-                        ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book.book_id).delete()
-                        ub.session.commit()
-                    except (OperationalError, InvalidRequestError):
-                        ub.session.rollback()
-                        flash(_(u"Settings DB is not Writeable"), category="error")
-        return render_title_template(page, entries=result, title=_(u"Shelf: '%(name)s'", name=shelf.name),
-                                     shelf=shelf, page="shelf")
-    else:
-        flash(_(u"Error opening shelf. Shelf does not exist or is not accessible"), category="error")
-        return redirect(url_for("web.index"))
+@shelf.route("/shelf/<int:shelf_id>", defaults={"sort_param": "order", 'page': 1})
+@shelf.route("/shelf/<int:shelf_id>/<sort_param>", defaults={'page': 1})
+@shelf.route("/shelf/<int:shelf_id>/<sort_param>/<int:page>")
+@login_required_if_no_ano
+def show_shelf(shelf_id, sort_param, page):
+    return render_show_shelf(1, shelf_id, page, sort_param)
 
 
 @shelf.route("/shelf/order/<int:shelf_id>", methods=["GET", "POST"])
@@ -394,22 +373,80 @@ def order_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     result = list()
     if shelf and check_shelf_view_permissions(shelf):
-        books_in_shelf2 = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id) \
-            .order_by(ub.BookShelf.order.asc()).all()
-        for book in books_in_shelf2:
-            cur_book = calibre_db.get_filtered_book(book.book_id)
-            if cur_book:
-                result.append({'title': cur_book.title,
-                               'id': cur_book.id,
-                               'author': cur_book.authors,
-                               'series': cur_book.series,
-                               'series_index': cur_book.series_index})
-            else:
-                cur_book = calibre_db.get_book(book.book_id)
-                result.append({'title': _('Hidden Book'),
-                               'id': cur_book.id,
-                               'author': [],
-                               'series': []})
+        result = calibre_db.session.query(db.Books)\
+            .join(ub.BookShelf,ub.BookShelf.book_id == db.Books.id , isouter=True) \
+            .add_columns(calibre_db.common_filters().label("visible")) \
+            .filter(ub.BookShelf.shelf == shelf_id).order_by(ub.BookShelf.order.asc()).all()
     return render_title_template('shelf_order.html', entries=result,
                                  title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name),
                                  shelf=shelf, page="shelforder")
+
+def change_shelf_order(shelf_id, order):
+    result = calibre_db.session.query(db.Books).join(ub.BookShelf,ub.BookShelf.book_id == db.Books.id)\
+        .filter(ub.BookShelf.shelf == shelf_id).order_by(*order).all()
+    for index, entry in enumerate(result):
+        book = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id) \
+            .filter(ub.BookShelf.book_id == entry.id).first()
+        book.order = index
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
+
+def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
+    shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
+
+    # check user is allowed to access shelf
+    if shelf and check_shelf_view_permissions(shelf):
+
+        if shelf_type == 1:
+            # order = [ub.BookShelf.order.asc()]
+            if sort_param == 'pubnew':
+                change_shelf_order(shelf_id, [db.Books.pubdate.desc()])
+            if sort_param == 'pubold':
+                change_shelf_order(shelf_id, [db.Books.pubdate])
+            if sort_param == 'abc':
+                change_shelf_order(shelf_id, [db.Books.sort])
+            if sort_param == 'zyx':
+                change_shelf_order(shelf_id, [db.Books.sort.desc()])
+            if sort_param == 'new':
+                change_shelf_order(shelf_id, [db.Books.timestamp.desc()])
+            if sort_param == 'old':
+                change_shelf_order(shelf_id, [db.Books.timestamp])
+            if sort_param == 'authaz':
+                change_shelf_order(shelf_id, [db.Books.author_sort.asc()])
+            if sort_param == 'authza':
+                change_shelf_order(shelf_id, [db.Books.author_sort.desc()])
+            page = "shelf.html"
+            pagesize = 0
+        else:
+            pagesize = sys.maxsize
+            page = 'shelfdown.html'
+
+        result, __, pagination = calibre_db.fill_indexpage(page_no, pagesize,
+                                                            db.Books,
+                                                            ub.BookShelf.shelf == shelf_id,
+                                                            [ub.BookShelf.order.asc()],
+                                                            ub.BookShelf,ub.BookShelf.book_id == db.Books.id)
+        # delete chelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web
+        wrong_entries = calibre_db.session.query(ub.BookShelf)\
+            .join(db.Books, ub.BookShelf.book_id == db.Books.id, isouter=True)\
+            .filter(db.Books.id == None).all()
+        for entry in wrong_entries:
+            log.info('Not existing book {} in {} deleted'.format(entry.book_id, shelf))
+            try:
+                ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == entry.book_id).delete()
+                ub.session.commit()
+            except (OperationalError, InvalidRequestError):
+                ub.session.rollback()
+                flash(_(u"Settings DB is not Writeable"), category="error")
+
+        return render_title_template(page,
+                                     entries=result,
+                                     pagination=pagination,
+                                     title=_(u"Shelf: '%(name)s'", name=shelf.name),
+                                     shelf=shelf,
+                                     page="shelf")
+    else:
+        flash(_(u"Error opening shelf. Shelf does not exist or is not accessible"), category="error")
+        return redirect(url_for("web.index"))
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index c67fdfb2..ffa5ecca 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -240,7 +240,7 @@ body.blur .row-fluid .col-sm-10 {
 
 .col-sm-10 .book-meta > div.btn-toolbar:after {
     content: '';
-    direction: block;
+    direction: ltr;
     position: fixed;
     top: 120px;
     right: 0;
@@ -398,20 +398,17 @@ body.blur .row-fluid .col-sm-10 {
 
 .shelforder #sortTrue > div:hover {
     background-color: hsla(0, 0%, 100%, .06) !important;
-    cursor: move;
     cursor: grab;
-    cursor: -webkit-grab;
     color: #eee
 }
 
 .shelforder #sortTrue > div:active {
     cursor: grabbing;
-    cursor: -webkit-grabbing
 }
 
 .shelforder #sortTrue > div:before {
     content: "\EA53";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     margin-right: 30px;
     margin-left: 15px;
     vertical-align: bottom;
@@ -446,7 +443,7 @@ body.blur .row-fluid .col-sm-10 {
 
 body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     content: "\e155";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -494,7 +491,7 @@ body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
 }
 
 #have_read_cb + label:before, #have_read_cb:checked + label:before {
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-size: 16px;
     height: 40px;
     width: 60px;
@@ -550,13 +547,12 @@ body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     height: 60px;
     width: 50px;
     cursor: pointer;
-    margin: 0;
     display: inline-block;
-    margin-top: -4px;
+    margin: -4px 0 0;
 }
 
 #archived_cb + label:before, #archived_cb:checked + label:before {
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-size: 16px;
     height: 40px;
     width: 60px;
@@ -618,7 +614,7 @@ div[aria-label="Edit/Delete book"] > .btn > span {
 
 div[aria-label="Edit/Delete book"] > .btn > span:before {
     content: "\EA5d";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     font-size: 20px;
     padding: 16px 15px;
     display: inline-block;
@@ -641,7 +637,7 @@ div[aria-label="Edit/Delete book"] > .btn > span:hover {
     width: 225px;
     max-width: 225px;
     position: relative !important;
-    left: auto !important; 
+    left: auto !important;
     top: auto !important;
     -webkit-transform: none !important;
     -ms-transform: none !important;
@@ -760,7 +756,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-header > a
 
 .home-btn {
     color: hsla(0, 0%, 100%, .7);
-    line-height: 34.29px;
+    line-height: 34px;
     margin: 0;
     padding: 0;
     position: absolute;
@@ -770,7 +766,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-header > a
 
 .home-btn > a {
     color: rgba(255, 255, 255, .7);
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     line-height: 60px;
     position: relative;
     text-align: center;
@@ -800,7 +796,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.home-btn > a:hove
 
 .glyphicon-search:before {
     content: "\EA4F";
-    font-family: plex-icons
+    font-family: plex-icons, serif
 }
 
 #nav_about:after, .profileDrop > span:after, .profileDrop > span:before {
@@ -833,7 +829,7 @@ body:not(.read-frame) {
     overflow: hidden;
     margin: 0;
     /* scroll bar fix for firefox  */
-    scrollbar-color: hsla(0, 0%, 100%, .2) transparent; 
+    scrollbar-color: hsla(0, 0%, 100%, .2) transparent;
     scrollbar-width: thin;
 }
 
@@ -966,7 +962,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
 
 #form-upload .form-group .btn:before {
     content: "\e043";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -991,7 +987,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
 #form-upload .form-group .btn:after {
     content: "\EA13";
     position: absolute;
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 8px;
     background: #3c444a;
     color: hsla(0, 0%, 100%, .7);
@@ -1019,7 +1015,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
     text-transform: none;
     font-weight: 400;
     font-style: normal;
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
     line-height: 1;
@@ -1075,7 +1071,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
 
 body > div.navbar.navbar-default.navbar-static-top > div > form > div > span > button:before {
     content: "\EA32";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     color: #eee;
     background: #555;
     font-size: 10px;
@@ -1097,7 +1093,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form > div > span > b
 body > div.navbar.navbar-default.navbar-static-top > div > form:before {
     content: "\EA4F";
     display: block;
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     position: absolute;
     color: #eee;
     font-weight: 400;
@@ -1120,7 +1116,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form:before {
 body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > div > span.input-group-btn:before {
     content: "\EA4F";
     display: block;
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     position: absolute;
     left: -298px;
     top: 8px;
@@ -1193,7 +1189,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-collapse.c
 
 body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-collapse.collapse > ul > li > #top_admin > .glyphicon-dashboard::before {
     content: "\EA31";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 20px
 }
 
@@ -1272,7 +1268,7 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
     user-select: none
 }
 
-.navigation li, .navigation li:not(ul>li) {
+.navigation li, .navigation li:not(ul > li) {
     border-radius: 0 4px 4px 0
 }
 
@@ -1352,32 +1348,32 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
 
 #nav_hot .glyphicon-fire::before {
     content: "\1F525";
-    font-family: glyphicons regular
+    font-family: glyphicons regular, serif
 }
 
 .glyphicon-star:before {
     content: "\EA10";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #nav_rand .glyphicon-random::before {
     content: "\EA44";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 .glyphicon-list::before {
     content: "\EA4D";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #nav_about .glyphicon-info-sign::before {
     content: "\EA26";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #nav_cat .glyphicon-inbox::before, .glyphicon-tags::before {
     content: "\E067";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     margin-left: 2px
 }
 
@@ -1423,7 +1419,7 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
 
 .navigation .create-shelf a:before {
     content: "\EA13";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 100%;
     padding-right: 10px;
     vertical-align: middle
@@ -1473,7 +1469,7 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
 
 #books > .cover > a:before, #books_rand > .cover > a:before, .book.isotope-item > .cover > a:before, body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form > div.col-sm-12 > div.col-sm-12 > div.col-sm-2 > a:before {
     content: "\e352";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     background: var(--color-secondary);
     border-radius: 50%;
     font-weight: 400;
@@ -1521,8 +1517,8 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form
     top: 0;
     left: 0;
     opacity: 0;
-    background: -webkit-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
-    background: -o-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -webkit-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -o-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     background: radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     z-index: -9
 }
@@ -1562,8 +1558,8 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form
     top: 0;
     left: 0;
     opacity: 0;
-    background: -webkit-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
-    background: -o-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -webkit-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -o-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     background: radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%)
 }
 
@@ -1739,7 +1735,7 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 {
 
 body.me > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     content: '';
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     font-size: 6vw;
@@ -1947,7 +1943,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.pagination .page-next > a
 body > div.container-fluid > div > div.col-sm-10 > div.pagination .page-previous > a
 {
     top: 0;
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 100;
     -webkit-font-smoothing: antialiased;
     line-height: 60px;
@@ -2026,7 +2022,7 @@ body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container > di
 
 body.serieslist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e044";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -2130,7 +2126,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container
 
 body.catlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     content: "\E067";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -2150,7 +2146,7 @@ body.catlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
 
 
 body.authorlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.langlist > div.container-fluid > div > div.col-sm-10:before {
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -2249,7 +2245,7 @@ body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before
 
 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 {
@@ -2491,7 +2487,6 @@ body > div.container-fluid > div > div.col-sm-10 > div.col-sm-8 > form > .btn.bt
 }
 
 textarea {
-    resize: none;
     resize: vertical
 }
 
@@ -2837,7 +2832,7 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-8 > form
 
 body.advanced_search > div.container-fluid > div > div.col-sm-10 > div.col-sm-8:before {
     content: "\EA4F";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -3159,7 +3154,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div.
 
 #add-to-shelf > span.glyphicon.glyphicon-list:before {
     content: "\EA59";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     font-size: 18px
 }
 
@@ -3171,7 +3166,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div.
 
 #read-in-browser > span.glyphicon-eye-open:before, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.glyphicon-eye-open:before {
     content: "\e352";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-size: 18px;
     padding-right: 5px
 }
@@ -3183,7 +3178,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div.
 #btnGroupDrop1 > span.glyphicon-download:before {
     font-size: 20px;
     content: "\ea66";
-    font-family: plex-icons
+    font-family: plex-icons, serif
 }
 
 .col-sm-10 .book-meta > div.btn-toolbar {
@@ -3287,7 +3282,6 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd
     -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .35);
     box-shadow: 0 4px 10px rgba(0, 0, 0, .35);
     -o-transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
-    transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
     transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4), -webkit-transform .15s cubic-bezier(.6, .4, .2, 1.4);
     -webkit-transform-origin: center top;
     -ms-transform-origin: center top;
@@ -3416,7 +3410,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > .btn-primary:l
 
 .book-meta > div.more-stuff > .btn-toolbar > .btn-group[aria-label="Remove from shelves"] > a > .glyphicon-remove:before {
     content: "\ea64";
-    font-family: plex-icons
+    font-family: plex-icons, serif
 }
 
 body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form > .col-sm-6 {
@@ -3530,7 +3524,7 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-b
 
 body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-btn-group > [data-target="#DeleteShelfDialog"]:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .7);
     font-size: 20px;
@@ -3560,7 +3554,7 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-b
 
 body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-btn-group > [href*=edit]:before {
     content: "\EA5d";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .7);
     font-size: 20px;
@@ -3590,7 +3584,7 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-b
 
 body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-btn-group > [href*=order]:before {
     content: "\E409";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .7);
     font-size: 20px;
@@ -3727,7 +3721,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-header > a
 
 .plexBack > a {
     color: rgba(255, 255, 255, .7);
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     -webkit-font-variant-ligatures: normal;
     font-variant-ligatures: normal;
     line-height: 60px;
@@ -3839,11 +3833,9 @@ body.login > div.container-fluid > div.row-fluid > div.col-sm-10::before, body.l
     -webkit-transform: translateY(-50%);
     -ms-transform: translateY(-50%);
     transform: translateY(-50%);
-    border-style: solid;
     vertical-align: middle;
     -webkit-transition: border .2s, -webkit-transform .4s;
     -o-transition: border .2s, transform .4s;
-    transition: border .2s, transform .4s;
     transition: border .2s, transform .4s, -webkit-transform .4s;
     margin: 9px 6px
 }
@@ -3862,11 +3854,9 @@ body.login > div.container-fluid > div.row-fluid > div.col-sm-10::before, body.l
     -webkit-transform: translateY(-50%);
     -ms-transform: translateY(-50%);
     transform: translateY(-50%);
-    border-style: solid;
     vertical-align: middle;
     -webkit-transition: border .2s, -webkit-transform .4s;
     -o-transition: border .2s, transform .4s;
-    transition: border .2s, transform .4s;
     transition: border .2s, transform .4s, -webkit-transform .4s;
     margin: 12px 6px
 }
@@ -3946,7 +3936,7 @@ body.author img.bg-blur[src=undefined] {
 
 body.author:not(.authorlist) .undefined-img:before {
     content: "\e008";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -4095,7 +4085,7 @@ body.shelf.modal-open > .container-fluid {
     font-size: 18px;
     color: #999;
     display: inline-block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400
 }
@@ -4196,7 +4186,7 @@ body.shelf.modal-open > .container-fluid {
 
 #remove-from-shelves > .btn > span:before {
     content: "\EA52";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     color: transparent;
     padding-left: 5px
 }
@@ -4208,7 +4198,7 @@ body.shelf.modal-open > .container-fluid {
 
 #remove-from-shelves > a:first-of-type:before {
     content: "\EA4D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .45);
     font-style: normal;
@@ -4248,7 +4238,7 @@ body.shelf.modal-open > .container-fluid {
     content: "\E208";
     padding-right: 10px;
     display: block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     position: absolute;
@@ -4259,7 +4249,6 @@ body.shelf.modal-open > .container-fluid {
     opacity: .5;
     -webkit-transition: -webkit-transform .3s ease-out;
     -o-transition: transform .3s ease-out;
-    transition: transform .3s ease-out;
     transition: transform .3s ease-out, -webkit-transform .3s ease-out;
     -webkit-transform: translate(0, -60px);
     -ms-transform: translate(0, -60px);
@@ -4319,7 +4308,7 @@ body.advanced_search > div.container-fluid > div > div.col-sm-10 > div.col-sm-8
 
 .glyphicon-remove:before {
     content: "\EA52";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400
 }
 
@@ -4405,7 +4394,7 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div
 
     body:not(.blur) #nav_new:before {
         content: "\EA4F";
-        font-family: plex-icons;
+        font-family: plex-icons, serif;
         font-style: normal;
         font-weight: 400;
         line-height: 1;
@@ -4431,7 +4420,7 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div
         color: hsla(0, 0%, 100%, .7);
         cursor: pointer;
         display: block;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         font-size: 20px;
         font-stretch: 100%;
         font-style: normal;
@@ -4527,12 +4516,12 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
 }
 
 body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > div.row > div.col .table > tbody > tr > td, body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > div.row > div.col .table > tbody > tr > th, body.admin > div.container-fluid > div > div.col-sm-10 > div.discover > .table > tbody > tr > td, body.admin > div.container-fluid > div > div.col-sm-10 > div.discover > .table > tbody > tr > th {
-    border: collapse
+    border: collapse;
 }
 
 body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10::before, body.newuser.admin > div.container-fluid > div.row-fluid > div.col-sm-10::before {
     content: '';
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     font-size: 6vw;
@@ -4636,7 +4625,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     content: "\e352";
     display: inline-block;
     position: absolute;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     background: var(--color-secondary);
     color: #fff;
     border-radius: 50%;
@@ -4674,8 +4663,8 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     top: 0;
     left: 0;
     opacity: 0;
-    background: -webkit-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
-    background: -o-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -webkit-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -o-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     background: radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%)
 }
 
@@ -4727,7 +4716,7 @@ body.admin td > a:hover {
 
 .glyphicon-ok::before {
     content: "\EA55";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400
 }
 
@@ -4796,7 +4785,7 @@ body:not(.blur):not(.login):not(.me):not(.author):not(.editbook):not(.upload):no
     background-position: center center, center center, center center !important;
     background-size: auto, auto, cover !important;
     -webkit-background-size: auto, auto, cover !important;
-    -moz-background-size: autom, auto, cover !important;
+    -moz-background-size: auto, auto, cover !important;
     -o-background-size: auto, auto, cover !important;
     width: 100%;
     height: 60px;
@@ -4862,7 +4851,6 @@ body.read:not(.blur) a[href*=readbooks] {
 .tooltip.in {
     opacity: 1;
     -o-transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
-    transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
     transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4), -webkit-transform .15s cubic-bezier(.6, .4, .2, 1.4);
     -webkit-transform: translate(0) scale(1);
     -ms-transform: translate(0) scale(1);
@@ -4962,7 +4950,7 @@ body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div
 
 body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-3 > div.text-center > #delete:before, body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-3 > div.text-center > #delete:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 18px;
     color: hsla(0, 0%, 100%, .7)
 }
@@ -5047,7 +5035,7 @@ body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.boot
 
 body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.bootstrap-table > div.fixed-table-container > div.fixed-table-body > #table > thead > tr > th > .th-inner.asc:after {
     content: "\EA58";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400;
     right: 20px;
     position: absolute
@@ -5055,7 +5043,7 @@ body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.boot
 
 body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.bootstrap-table > div.fixed-table-container > div.fixed-table-body > #table > thead > tr > th > .th-inner.desc:after {
     content: "\EA57";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400;
     right: 20px;
     position: absolute
@@ -5118,7 +5106,7 @@ body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.boot
 
 .epub-back:before {
     content: "\EA1C";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400;
     color: #4f4f4f;
     position: absolute;
@@ -5281,7 +5269,7 @@ body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm
 
 body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3 > div.text-center > #delete:before, body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3 > div.text-center > #delete:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 18px;
     color: hsla(0, 0%, 100%, .7);
     vertical-align: super
@@ -5441,7 +5429,7 @@ body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm
 
 #main-nav + #scnd-nav .create-shelf a:before {
     content: "\EA13";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 100%;
     padding-right: 10px;
     vertical-align: middle
@@ -5486,7 +5474,7 @@ body.admin.modal-open .navbar {
     content: "\E208";
     padding-right: 10px;
     display: block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     position: absolute;
@@ -5497,7 +5485,6 @@ body.admin.modal-open .navbar {
     opacity: .5;
     -webkit-transition: -webkit-transform .3s ease-out;
     -o-transition: transform .3s ease-out;
-    transition: transform .3s ease-out;
     transition: transform .3s ease-out, -webkit-transform .3s ease-out;
     -webkit-transform: translate(0, -60px);
     -ms-transform: translate(0, -60px);
@@ -5551,22 +5538,22 @@ body.admin.modal-open .navbar {
 
 #RestartDialog > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA4F";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before {
     content: "\E064";
-    font-family: glyphicons regular
+    font-family: glyphicons regular, serif
 }
 
 #StatusDialog > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA15";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #RestartDialog > .modal-dialog > .modal-content > .modal-header:after {
@@ -5957,7 +5944,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     .home-btn {
         height: 48px;
-        line-height: 28.29px;
+        line-height: 28px;
         right: 10px;
         left: auto
     }
@@ -5969,7 +5956,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     .plexBack {
         height: 48px;
-        line-height: 28.29px;
+        line-height: 28px;
         left: 48px;
         display: none
     }
@@ -6048,7 +6035,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > div > span.input-group-btn:before {
         content: "\EA33";
         display: block;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         position: fixed;
         left: 0;
         top: 0;
@@ -6200,7 +6187,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     #form-upload .form-group .btn:before {
         content: "\e043";
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         line-height: 1;
         -webkit-font-smoothing: antialiased;
         color: #fff;
@@ -6218,7 +6205,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     #form-upload .form-group .btn:after {
         content: "\EA13";
         position: absolute;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         font-size: 8px;
         background: #3c444a;
         color: #fff;
@@ -6271,7 +6258,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     }
 
     #top_admin, #top_tasks {
-        padding: 11.5px 15px;
+        padding: 12px 15px;
         font-size: 13px;
         line-height: 1.71428571;
         overflow: hidden
@@ -6280,7 +6267,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     #top_admin > .glyphicon, #top_tasks > .glyphicon-tasks {
         position: relative;
         top: 0;
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         line-height: 1;
         border-radius: 0;
         background: 0 0;
@@ -6299,7 +6286,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     #top_tasks > .glyphicon-tasks::before, body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-collapse.collapse > ul > li > #top_admin > .glyphicon-dashboard::before {
         text-transform: none;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         text-rendering: optimizeLegibility;
@@ -6624,7 +6611,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     .author > .container-fluid > .row-fluid > .col-sm-10 > h2:after {
         content: "\e008";
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         font-style: normal;
         font-weight: 400;
         line-height: 1;
@@ -6829,7 +6816,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         color: hsla(0, 0%, 100%, .7);
         cursor: pointer;
         display: block;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         font-size: 20px;
         font-stretch: 100%;
         font-style: normal;
@@ -6996,11 +6983,9 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         -webkit-transform: translateY(-50%);
         -ms-transform: translateY(-50%);
         transform: translateY(-50%);
-        border-style: solid;
         vertical-align: middle;
         -webkit-transition: border .2s, -webkit-transform .4s;
         -o-transition: border .2s, transform .4s;
-        transition: border .2s, transform .4s;
         transition: border .2s, transform .4s, -webkit-transform .4s;
         margin: 12px 6px
     }
@@ -7019,18 +7004,16 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         -webkit-transform: translateY(-50%);
         -ms-transform: translateY(-50%);
         transform: translateY(-50%);
-        border-style: solid;
         vertical-align: middle;
         -webkit-transition: border .2s, -webkit-transform .4s;
         -o-transition: border .2s, transform .4s;
-        transition: border .2s, transform .4s;
         transition: border .2s, transform .4s, -webkit-transform .4s;
         margin: 9px 6px
     }
 
     body.author:not(.authorlist) .blur-wrapper:before, body.author > .container-fluid > .row-fluid > .col-sm-10 > h2:after {
         content: "\e008";
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         font-weight: 400;
         z-index: 9;
         line-height: 1;
@@ -7361,7 +7344,6 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         transform: translate3d(0, 0, 0);
         -webkit-transition: -webkit-transform .5s;
         -o-transition: transform .5s;
-        transition: transform .5s;
         transition: transform .5s, -webkit-transform .5s;
         z-index: 99
     }
@@ -7376,7 +7358,6 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         transform: translate3d(-240px, 0, 0);
         -webkit-transition: -webkit-transform .5s;
         -o-transition: transform .5s;
-        transition: transform .5s;
         transition: transform .5s, -webkit-transform .5s;
         top: 0;
         margin: 0;
@@ -7415,7 +7396,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         text-align: center;
         min-width: 40px;
         pointer-events: none;
-        color: #
+        // color: #
     }
 
     .col-xs-12 > .row > .col-xs-10 {
@@ -7526,7 +7507,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
 body.publisherlist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e241";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -7546,7 +7527,7 @@ body.publisherlist > div.container-fluid > div > div.col-sm-10:before {
 
 body.ratingslist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e007";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -7572,7 +7553,7 @@ body.ratingslist > div.container-fluid > div > div.col-sm-10:before {
 
 body.formatslist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e022";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -7747,7 +7728,7 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .editabl
 
 body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphicon-trash:before {
     content: "\EA6D";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #DeleteDomain {
@@ -7770,7 +7751,7 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic
     content: "\E208";
     padding-right: 10px;
     display: block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     position: absolute;
@@ -7781,7 +7762,6 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic
     opacity: .5;
     -webkit-transition: -webkit-transform .3s ease-out;
     -o-transition: transform .3s ease-out;
-    transition: transform .3s ease-out;
     transition: transform .3s ease-out, -webkit-transform .3s ease-out;
     -webkit-transform: translate(0, -60px);
     -ms-transform: translate(0, -60px);
@@ -7820,7 +7800,7 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic
 
 #DeleteDomain > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     padding-right: 10px;
     font-size: 18px;
     color: #999;
diff --git a/cps/static/css/caliBlur_override.css b/cps/static/css/caliBlur_override.css
index 7f940212..00ba3cca 100644
--- a/cps/static/css/caliBlur_override.css
+++ b/cps/static/css/caliBlur_override.css
@@ -1,11 +1,11 @@
 body.serieslist.grid-view div.container-fluid>div>div.col-sm-10:before{
     display: none;
 }
-
 .cover .badge{
     position: absolute;
     top: 0;
     left: 0;
+    color: #fff;
     background-color: #cc7b19;
     border-radius: 0;
     padding: 0 8px;
@@ -15,3 +15,8 @@ body.serieslist.grid-view div.container-fluid>div>div.col-sm-10:before{
 .cover{
     box-shadow: 0 0 4px rgba(0,0,0,.6);
 }
+
+.cover .read{
+    padding: 0 0px;
+    line-height: 15px;
+}
diff --git a/cps/static/css/libs/bootstrap-select.min.css b/cps/static/css/libs/bootstrap-select.min.css
new file mode 100644
index 00000000..59708ed5
--- /dev/null
+++ b/cps/static/css/libs/bootstrap-select.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */@-webkit-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@-o-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}.bootstrap-select>select.bs-select-hidden,select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\0;vertical-align:middle}.bootstrap-select>.dropdown-toggle{position:relative;width:100%;text-align:right;white-space:nowrap;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.bootstrap-select>.dropdown-toggle:after{margin-top:-1px}.bootstrap-select>.dropdown-toggle.bs-placeholder,.bootstrap-select>.dropdown-toggle.bs-placeholder:active,.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder:hover{color:#999}.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover{color:rgba(255,255,255,.5)}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none;z-index:0!important}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2!important}.bootstrap-select.is-invalid .dropdown-toggle,.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle,.was-validated .bootstrap-select select:invalid+.dropdown-toggle{border-color:#b94a48}.bootstrap-select.is-valid .dropdown-toggle,.was-validated .bootstrap-select select:valid+.dropdown-toggle{border-color:#28a745}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .dropdown-toggle:focus,.bootstrap-select>select.mobile-device:focus+.dropdown-toggle{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none;height:auto}:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.form-control.input-group-btn{float:none;z-index:auto}.form-inline .bootstrap-select,.form-inline .bootstrap-select.form-control:not([class*=col-]){width:auto}.bootstrap-select:not(.input-group-btn),.bootstrap-select[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.dropdown-menu-right,.bootstrap-select[class*=col-].dropdown-menu-right,.row .bootstrap-select[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select,.form-horizontal .bootstrap-select,.form-inline .bootstrap-select{margin-bottom:0}.form-group-lg .bootstrap-select.form-control,.form-group-sm .bootstrap-select.form-control{padding:0}.form-group-lg .bootstrap-select.form-control .dropdown-toggle,.form-group-sm .bootstrap-select.form-control .dropdown-toggle{height:100%;font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-lg .dropdown-toggle,.bootstrap-select.form-control-sm .dropdown-toggle{font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-sm .dropdown-toggle{padding:.25rem .5rem}.bootstrap-select.form-control-lg .dropdown-toggle{padding:.5rem 1rem}.form-inline .bootstrap-select .form-control{width:100%}.bootstrap-select.disabled,.bootstrap-select>.disabled{cursor:not-allowed}.bootstrap-select.disabled:focus,.bootstrap-select>.disabled:focus{outline:0!important}.bootstrap-select.bs-container{position:absolute;top:0;left:0;height:0!important;padding:0!important}.bootstrap-select.bs-container .dropdown-menu{z-index:1060}.bootstrap-select .dropdown-toggle .filter-option{position:static;top:0;left:0;float:left;height:100%;width:100%;text-align:left;overflow:hidden;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto}.bs3.bootstrap-select .dropdown-toggle .filter-option{padding-right:inherit}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option{position:absolute;padding-top:inherit;padding-bottom:inherit;padding-left:inherit;float:none}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner{padding-right:inherit}.bootstrap-select .dropdown-toggle .filter-option-inner-inner{overflow:hidden}.bootstrap-select .dropdown-toggle .filter-expand{width:0!important;float:left;opacity:0!important;overflow:hidden}.bootstrap-select .dropdown-toggle .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.input-group .bootstrap-select.form-control .dropdown-toggle{border-radius:inherit}.bootstrap-select[class*=col-] .dropdown-toggle{width:100%}.bootstrap-select .dropdown-menu{min-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu>.inner:focus{outline:0!important}.bootstrap-select .dropdown-menu.inner{position:static;float:none;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select .dropdown-menu li{position:relative}.bootstrap-select .dropdown-menu li.active small{color:rgba(255,255,255,.5)!important}.bootstrap-select .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select .dropdown-menu li a{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bootstrap-select .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select .dropdown-menu li a span.check-mark{display:none}.bootstrap-select .dropdown-menu li a span.text{display:inline-block}.bootstrap-select .dropdown-menu li small{padding-left:.5em}.bootstrap-select .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu .notify.fadeOut{-webkit-animation:.3s linear 750ms forwards bs-notify-fadeOut;-o-animation:.3s linear 750ms forwards bs-notify-fadeOut;animation:.3s linear 750ms forwards bs-notify-fadeOut}.bootstrap-select .no-results{padding:3px;background:#f5f5f5;margin:0 5px;white-space:nowrap}.bootstrap-select.fit-width .dropdown-toggle .filter-option{position:static;display:inline;padding:0}.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner{display:inline}.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before{content:'\00a0'}.bootstrap-select.fit-width .dropdown-toggle .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark{position:absolute;display:inline-block;right:15px;top:5px}.bootstrap-select.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select .bs-ok-default:after{content:'';display:block;width:.5em;height:1em;border-style:solid;border-width:0 .26em .26em 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle{z-index:1061}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before{bottom:auto;top:-4px;border-top:7px solid rgba(204,204,204,.2);border-bottom:0}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after{bottom:auto;top:-4px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before{display:block}.bs-actionsbox,.bs-donebutton,.bs-searchbox{padding:4px 8px}.bs-actionsbox{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-donebutton{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-donebutton .btn-group button{width:100%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox .form-control{margin-bottom:0;width:100%;float:none}
\ No newline at end of file
diff --git a/cps/static/css/main.css b/cps/static/css/main.css
index 08506bc2..2831a0fd 100644
--- a/cps/static/css/main.css
+++ b/cps/static/css/main.css
@@ -25,10 +25,9 @@ body {
   overflow: hidden;
   -webkit-transition: -webkit-transform 0.4s, width 0.2s;
   -moz-transition: -webkit-transform 0.4s, width 0.2s;
-  -ms-transition: -webkit-transform 0.4s, width 0.2s;
+  transition: -webkit-transform 0.4s, width 0.2s;
   -moz-box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
   -webkit-box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
-  -ms-box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
 }
 
@@ -45,7 +44,7 @@ body {
   text-align: center;
   -webkit-transition: opacity 0.5s;
   -moz-transition: opacity 0.5s;
-  -ms-transition: opacity 0.5s;
+  transition: opacity 0.5s;
   z-index: 10;
 }
 
@@ -79,7 +78,6 @@ body {
   color: rgba(0, 0, 0, 0.6);
   -moz-box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
   -webkit-box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
-  -ms-box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
   box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
 }
 
@@ -121,7 +119,6 @@ body {
   font-weight: bold;
   cursor: pointer;
   -webkit-user-select: none;
-  -khtml-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
@@ -147,7 +144,7 @@ body {
   height: 100%;
   -webkit-transition: -webkit-transform 0.5s;
   -moz-transition: -moz-transform 0.5s;
-  -ms-transition: -moz-transform 0.5s;
+  transition: -moz-transform 0.5s;
   overflow: hidden;
 }
 
@@ -183,7 +180,6 @@ body {
   height: 14px;
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -ms-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
 }
 
@@ -232,7 +228,6 @@ body {
 
 input::-webkit-input-placeholder { color: #454545; }
 input:-moz-placeholder { color: #454545; }
-input:-ms-placeholder { color: #454545; }
 
 #divider {
   position: absolute;
@@ -268,18 +263,18 @@ input:-ms-placeholder { color: #454545; }
   width: 25%;
   height: 100%;
   visibility: hidden;
-  -webkit-transition: visibility 0 ease 0.5s;
-  -moz-transition: visibility 0 ease 0.5s;
-  -ms-transition: visibility 0 ease 0.5s;
+  -webkit-transition: visibility 0s ease 0.5s;
+  -moz-transition: visibility 0s ease 0.5s;
+  transition: visibility 0s ease 0.5s;
 }
 
 #sidebar.open #tocView,
 #sidebar.open #bookmarksView {
   overflow-y: auto;
   visibility: visible;
-  -webkit-transition: visibility 0 ease 0;
-  -moz-transition: visibility 0 ease 0;
-  -ms-transition: visibility 0 ease 0;
+  -webkit-transition: visibility 0s ease 0s;
+  -moz-transition: visibility 0s ease 0s;
+  transition: visibility 0s ease 0s;
 }
 
 #sidebar.open #tocView {
@@ -495,9 +490,8 @@ input:-ms-placeholder { color: #454545; }
   position: fixed;
   top: 50%;
   left: 50%;
-  width: 50%;
+  // width: 50%;
   width: 630px;
-
   height: auto;
   z-index: 2000;
   visibility: hidden;
@@ -518,7 +512,6 @@ input:-ms-placeholder { color: #454545; }
   background: rgba(255, 255, 255, 0.8);
   -webkit-transition: all 0.3s;
   -moz-transition: all 0.3s;
-  -ms-transition: all 0.3s;
   transition: all 0.3s;
 }
 
@@ -588,7 +581,6 @@ input:-ms-placeholder { color: #454545; }
   opacity: 0;
   -webkit-transition: all 0.3s;
   -moz-transition: all 0.3s;
-  -ms-transition: all 0.3s;
   transition: all 0.3s;
 }
 
@@ -601,7 +593,7 @@ input:-ms-placeholder { color: #454545; }
 }
 
 .md-content > .closer {
-  font-size: 18px;
+  //font-size: 18px;
   position: absolute;
   right: 0;
   top: 0;
@@ -663,7 +655,7 @@ input:-ms-placeholder { color: #454545; }
     -ms-transform: translate(0, 0);
     -webkit-transition: -webkit-transform .3s;
     -moz-transition: -moz-transform .3s;
-    -ms-transition: -moz-transform .3s;
+    transition: -moz-transform .3s;
   }
 
   #main.closed {
@@ -778,7 +770,7 @@ and (orientation : landscape)
 }
 
 [class^="icon-"]:before, [class*=" icon-"]:before {
-    font-family: "fontello";
+    font-family: "fontello", serif;
     font-style: normal;
     font-weight: normal;
     speak: none;
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 47b0c4cb..8c99aaa0 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -116,6 +116,7 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
   display: block;
   max-width: 100%;
   height: auto;
+  max-height: 100%;
 }
 
 .container-fluid .discover{ margin-bottom: 50px; }
@@ -132,12 +133,19 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
   position: relative;
 }
 
-.container-fluid .book .cover img {
+.container-fluid .book .cover span.img {
+  bottom: 0;
+  height: 100%;
+  position: absolute;
+}
+
+.container-fluid .book .cover span img {
+  position: relative;
+  top: 0;
+  left: 0;
+  height: 100%;
   border: 1px solid #fff;
   box-sizing: border-box;
-  height: 100%;
-  bottom: 0;
-  position: absolute;
   -webkit-box-shadow: 0 5px 8px -6px #777;
   -moz-box-shadow: 0 5px 8px -6px #777;
   box-shadow: 0 5px 8px -6px #777;
@@ -206,11 +214,22 @@ span.glyphicon.glyphicon-tags {
 .navbar-default .navbar-toggle .icon-bar {background-color: #000; }
 .navbar-default .navbar-toggle {border-color: #000; }
 .cover { margin-bottom: 10px; }
+
 .cover .badge{
    position: absolute;
    top: 2px;
    left: 2px;
-   background-color: #777;
+   color: #000;
+   border-radius: 10px;
+   background-color: #fff;
+}
+.cover .read{
+  left: auto;
+  right: 2px;
+  width: 17px;
+  height: 17px;
+  display: inline-block;
+  padding: 2px;
 }
 .cover-height { max-height: 100px;}
 
@@ -241,7 +260,7 @@ span.glyphicon.glyphicon-tags {
 .button-link {color: #fff; }
 .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
 .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; }
-.btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left: 0px; }
+.btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left: 0; }
 .panel-body {background-color: #f5f5f5; }
 .spinner {margin: 0 41%; }
 .spinner2 {margin: 0 41%; }
@@ -311,11 +330,11 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
 .editable-input { display:inline-block; }
 
 .editable-cancel {
-  margin-bottom: 0px !important;
+  margin-bottom: 0 !important;
   margin-left: 7px !important;
 }
 
-.editable-submit { margin-bottom: 0px !important; }
+.editable-submit { margin-bottom: 0 !important; }
 .filterheader { margin-bottom: 20px; }
 .errorlink { margin-top: 20px; }
 .emailconfig { margin-top: 10px; }
@@ -326,7 +345,7 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
 }
 
 div.log {
-  font-family: Courier New;
+  font-family: Courier New, serif;
   font-size: 12px;
   box-sizing: border-box;
   height: 700px;
diff --git a/cps/static/js/archive/archive.js b/cps/static/js/archive/archive.js
index 06c05624..cb76321f 100644
--- a/cps/static/js/archive/archive.js
+++ b/cps/static/js/archive/archive.js
@@ -411,19 +411,6 @@ bitjs.archive = bitjs.archive || {};
         return "unrar.js";
     };
 
-    /**
-     * Unrarrer5
-     * @extends {bitjs.archive.Unarchiver}
-     * @constructor
-     */
-    bitjs.archive.Unrarrer5 = function(arrayBuffer, optPathToBitJS) {
-        bitjs.base(this, arrayBuffer, optPathToBitJS);
-    };
-    bitjs.inherits(bitjs.archive.Unrarrer5, bitjs.archive.Unarchiver);
-    bitjs.archive.Unrarrer5.prototype.getScriptFileName = function() {
-        return "unrar5.js";
-    };
-
     /**
      * Untarrer
      * @extends {bitjs.archive.Unarchiver}
diff --git a/cps/static/js/archive/unrar.js b/cps/static/js/archive/unrar.js
index 3e2a45af..fadb791e 100644
--- a/cps/static/js/archive/unrar.js
+++ b/cps/static/js/archive/unrar.js
@@ -14,10 +14,10 @@
 /* global VM_FIXEDGLOBALSIZE, VM_GLOBALMEMSIZE, MAXWINMASK, VM_GLOBALMEMADDR, MAXWINSIZE */
 
 // This file expects to be invoked as a Worker (see onmessage below).
-/*importScripts("../io/bitstream.js");
+importScripts("../io/bitstream.js");
 importScripts("../io/bytebuffer.js");
 importScripts("archive.js");
-importScripts("rarvm.js");*/
+importScripts("rarvm.js");
 
 // Progress variables.
 var currentFilename = "";
@@ -29,21 +29,19 @@ var totalFilesInArchive = 0;
 
 // Helper functions.
 var info = function(str) {
-    console.log(str);
-    // postMessage(new bitjs.archive.UnarchiveInfoEvent(str));
+    postMessage(new bitjs.archive.UnarchiveInfoEvent(str));
 };
 var err = function(str) {
-    console.log(str);
-    // postMessage(new bitjs.archive.UnarchiveErrorEvent(str));
+    postMessage(new bitjs.archive.UnarchiveErrorEvent(str));
 };
 var postProgress = function() {
-    /*postMessage(new bitjs.archive.UnarchiveProgressEvent(
+    postMessage(new bitjs.archive.UnarchiveProgressEvent(
         currentFilename,
         currentFileNumber,
         currentBytesUnarchivedInFile,
         currentBytesUnarchived,
         totalUncompressedBytesInArchive,
-        totalFilesInArchive));*/
+        totalFilesInArchive));
 };
 
 // shows a byte value as its hex representation
@@ -1300,7 +1298,7 @@ var unrar = function(arrayBuffer) {
     totalUncompressedBytesInArchive = 0;
     totalFilesInArchive = 0;
 
-    //postMessage(new bitjs.archive.UnarchiveStartEvent());
+    postMessage(new bitjs.archive.UnarchiveStartEvent());
     var bstream = new bitjs.io.BitStream(arrayBuffer, false /* rtl */);
 
     var header = new RarVolumeHeader(bstream);
@@ -1350,7 +1348,7 @@ var unrar = function(arrayBuffer) {
                 localfile.unrar();
 
                 if (localfile.isValid) {
-                    // postMessage(new bitjs.archive.UnarchiveExtractEvent(localfile));
+                    postMessage(new bitjs.archive.UnarchiveExtractEvent(localfile));
                     postProgress();
                 }
             }
@@ -1360,7 +1358,7 @@ var unrar = function(arrayBuffer) {
     } else {
         err("Invalid RAR file");
     }
-    // postMessage(new bitjs.archive.UnarchiveFinishEvent());
+    postMessage(new bitjs.archive.UnarchiveFinishEvent());
 };
 
 // event.data.file has the ArrayBuffer.
diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js
index 35515aa1..5f9154fc 100644
--- a/cps/static/js/edit_books.js
+++ b/cps/static/js/edit_books.js
@@ -249,18 +249,26 @@ promisePublishers.done(function() {
     );
 });
 
-$("#search").on("change input.typeahead:selected", function() {
+$("#search").on("change input.typeahead:selected", function(event) {
+    if (event.target.type == "search" && event.target.tagName == "INPUT") {
+        return;
+    }
     var form = $("form").serialize();
     $.getJSON( getPath() + "/get_matching_tags", form, function( data ) {
         $(".tags_click").each(function() {
-            if ($.inArray(parseInt($(this).children("input").first().val(), 10), data.tags) === -1 ) {
-                if (!($(this).hasClass("active"))) {
-                    $(this).addClass("disabled");
+            if ($.inArray(parseInt($(this).val(), 10), data.tags) === -1) {
+                if(!$(this).prop("selected")) {
+                    $(this).prop("disabled", true);
                 }
             } else {
-                $(this).removeClass("disabled");
+                $(this).prop("disabled", false);
             }
         });
+        $("#include_tag option:selected").each(function () {
+            $("#exclude_tag").find("[value="+$(this).val()+"]").prop("disabled", true);
+        });
+        $('#include_tag').selectpicker("refresh");
+        $('#exclude_tag').selectpicker("refresh");
     });
 });
 
diff --git a/cps/static/js/filter_list.js b/cps/static/js/filter_list.js
index 676ff47b..679c5359 100644
--- a/cps/static/js/filter_list.js
+++ b/cps/static/js/filter_list.js
@@ -19,16 +19,9 @@ var direction = 0;  // Descending order
 var sort = 0;       // Show sorted entries
 
 $("#sort_name").click(function() {
-    var class_name = $("h1").attr('Class') + "_sort_name";
+    var className = $("h1").attr("Class") + "_sort_name";
     var obj = {};
-    obj[class_name] = sort;
-    /*$.ajax({
-        method:"post",
-        contentType: "application/json; charset=utf-8",
-        dataType: "json",
-        url: window.location.pathname + "/../../ajax/view",
-        data: JSON.stringify({obj}),
-    });*/
+    obj[className] = sort;
 
     var count = 0;
     var index = 0;
diff --git a/cps/static/js/kthoom.js b/cps/static/js/kthoom.js
index bbb3fead..33a2ac0e 100644
--- a/cps/static/js/kthoom.js
+++ b/cps/static/js/kthoom.js
@@ -162,15 +162,10 @@ function initProgressClick() {
 function loadFromArrayBuffer(ab) {
     var start = (new Date).getTime();
     var h = new Uint8Array(ab, 0, 10);
-    unrar5(ab);
     var pathToBitJS = "../../static/js/archive/";
     var lastCompletion = 0;
-    /*if (h[0] === 0x52 && h[1] === 0x61 && h[2] === 0x72 && h[3] === 0x21) { //Rar!
-        if (h[7] === 0x01) {
-            unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS);
-        } else {
-            unarchiver = new bitjs.archive.Unrarrer5(ab, pathToBitJS);
-        }
+    if (h[0] === 0x52 && h[1] === 0x61 && h[2] === 0x72 && h[3] === 0x21) { //Rar!
+        unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS);
     } else if (h[0] === 80 && h[1] === 75) { //PK (Zip)
         unarchiver = new bitjs.archive.Unzipper(ab, pathToBitJS);
     } else if (h[0] === 255 && h[1] === 216) { // JPEG
@@ -234,7 +229,7 @@ function loadFromArrayBuffer(ab) {
         unarchiver.start();
     } else {
         alert("Some error");
-    }*/
+    }
 }
 
 function scrollTocToActive() {
diff --git a/cps/static/js/libs/bootstrap-select.min.js b/cps/static/js/libs/bootstrap-select.min.js
new file mode 100644
index 00000000..92e3a32e
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select.min.js
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){!function(z){"use strict";var d=["sanitize","whiteList","sanitizeFn"],r=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],e={"*":["class","dir","id","lang","role","tabindex","style",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},l=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,a=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function v(e,t){var i=e.nodeName.toLowerCase();if(-1!==z.inArray(i,t))return-1===z.inArray(i,r)||Boolean(e.nodeValue.match(l)||e.nodeValue.match(a));for(var s=z(t).filter(function(e,t){return t instanceof RegExp}),n=0,o=s.length;n<o;n++)if(i.match(s[n]))return!0;return!1}function P(e,t,i){if(i&&"function"==typeof i)return i(e);for(var s=Object.keys(t),n=0,o=e.length;n<o;n++)for(var r=e[n].querySelectorAll("*"),l=0,a=r.length;l<a;l++){var c=r[l],d=c.nodeName.toLowerCase();if(-1!==s.indexOf(d))for(var h=[].slice.call(c.attributes),p=[].concat(t["*"]||[],t[d]||[]),u=0,f=h.length;u<f;u++){var m=h[u];v(m,p)||c.removeAttribute(m.nodeName)}else c.parentNode.removeChild(c)}}"classList"in document.createElement("_")||function(e){if("Element"in e){var t="classList",i="prototype",s=e.Element[i],n=Object,o=function(){var i=z(this);return{add:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.addClass(e)},remove:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.removeClass(e)},toggle:function(e,t){return i.toggleClass(e,t)},contains:function(e){return i.hasClass(e)}}};if(n.defineProperty){var r={get:o,enumerable:!0,configurable:!0};try{n.defineProperty(s,t,r)}catch(e){void 0!==e.number&&-2146823252!==e.number||(r.enumerable=!1,n.defineProperty(s,t,r))}}else n[i].__defineGetter__&&s.__defineGetter__(t,o)}}(window);var t,c,i=document.createElement("_");if(i.classList.add("c1","c2"),!i.classList.contains("c2")){var s=DOMTokenList.prototype.add,n=DOMTokenList.prototype.remove;DOMTokenList.prototype.add=function(){Array.prototype.forEach.call(arguments,s.bind(this))},DOMTokenList.prototype.remove=function(){Array.prototype.forEach.call(arguments,n.bind(this))}}if(i.classList.toggle("c3",!1),i.classList.contains("c3")){var o=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(e,t){return 1 in arguments&&!this.contains(e)==!t?t:o.call(this,e)}}function h(e){if(null==this)throw new TypeError;var t=String(this);if(e&&"[object RegExp]"==c.call(e))throw new TypeError;var i=t.length,s=String(e),n=s.length,o=1<arguments.length?arguments[1]:void 0,r=o?Number(o):0;r!=r&&(r=0);var l=Math.min(Math.max(r,0),i);if(i<n+l)return!1;for(var a=-1;++a<n;)if(t.charCodeAt(l+a)!=s.charCodeAt(a))return!1;return!0}function O(e,t){var i,s=e.selectedOptions,n=[];if(t){for(var o=0,r=s.length;o<r;o++)(i=s[o]).disabled||"OPTGROUP"===i.parentNode.tagName&&i.parentNode.disabled||n.push(i);return n}return s}function T(e,t){for(var i,s=[],n=t||e.selectedOptions,o=0,r=n.length;o<r;o++)(i=n[o]).disabled||"OPTGROUP"===i.parentNode.tagName&&i.parentNode.disabled||s.push(i.value);return e.multiple?s:s.length?s[0]:null}i=null,String.prototype.startsWith||(t=function(){try{var e={},t=Object.defineProperty,i=t(e,e,e)&&t}catch(e){}return i}(),c={}.toString,t?t(String.prototype,"startsWith",{value:h,configurable:!0,writable:!0}):String.prototype.startsWith=h),Object.keys||(Object.keys=function(e,t,i){for(t in i=[],e)i.hasOwnProperty.call(e,t)&&i.push(t);return i}),HTMLSelectElement&&!HTMLSelectElement.prototype.hasOwnProperty("selectedOptions")&&Object.defineProperty(HTMLSelectElement.prototype,"selectedOptions",{get:function(){return this.querySelectorAll(":checked")}});var p={useDefault:!1,_set:z.valHooks.select.set};z.valHooks.select.set=function(e,t){return t&&!p.useDefault&&z(e).data("selected",!0),p._set.apply(this,arguments)};var A=null,u=function(){try{return new Event("change"),!0}catch(e){return!1}}();function k(e,t,i,s){for(var n=["display","subtext","tokens"],o=!1,r=0;r<n.length;r++){var l=n[r],a=e[l];if(a&&(a=a.toString(),"display"===l&&(a=a.replace(/<[^>]+>/g,"")),s&&(a=w(a)),a=a.toUpperCase(),o="contains"===i?0<=a.indexOf(t):a.startsWith(t)))break}return o}function L(e){return parseInt(e,10)||0}z.fn.triggerNative=function(e){var t,i=this[0];i.dispatchEvent?(u?t=new Event(e,{bubbles:!0}):(t=document.createEvent("Event")).initEvent(e,!0,!1),i.dispatchEvent(t)):i.fireEvent?((t=document.createEventObject()).eventType=e,i.fireEvent("on"+e,t)):this.trigger(e)};var f={"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g","\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i","\u012b":"i","\u012d":"i","\u012f":"i","\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O","\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r","\u015a":"S","\u015c":"S","\u015e":"S","\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w","\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij","\u0152":"Oe","\u0153":"oe","\u0149":"'n","\u017f":"s"},m=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,g=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\u1ab0-\\u1aff\\u1dc0-\\u1dff]","g");function b(e){return f[e]}function w(e){return(e=e.toString())&&e.replace(m,b).replace(g,"")}var I,x,y,$,S=(I={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},x="(?:"+Object.keys(I).join("|")+")",y=RegExp(x),$=RegExp(x,"g"),function(e){return e=null==e?"":""+e,y.test(e)?e.replace($,E):e});function E(e){return I[e]}var C={32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",65:"A",66:"B",67:"C",68:"D",69:"E",70:"F",71:"G",72:"H",73:"I",74:"J",75:"K",76:"L",77:"M",78:"N",79:"O",80:"P",81:"Q",82:"R",83:"S",84:"T",85:"U",86:"V",87:"W",88:"X",89:"Y",90:"Z",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9"},N=27,D=13,H=32,W=9,B=38,M=40,R={success:!1,major:"3"};try{R.full=(z.fn.dropdown.Constructor.VERSION||"").split(" ")[0].split("."),R.major=R.full[0],R.success=!0}catch(e){}var U=0,j=".bs.select",V={DISABLED:"disabled",DIVIDER:"divider",SHOW:"open",DROPUP:"dropup",MENU:"dropdown-menu",MENURIGHT:"dropdown-menu-right",MENULEFT:"dropdown-menu-left",BUTTONCLASS:"btn-default",POPOVERHEADER:"popover-title",ICONBASE:"glyphicon",TICKICON:"glyphicon-ok"},F={MENU:"."+V.MENU},_={span:document.createElement("span"),i:document.createElement("i"),subtext:document.createElement("small"),a:document.createElement("a"),li:document.createElement("li"),whitespace:document.createTextNode("\xa0"),fragment:document.createDocumentFragment()};_.a.setAttribute("role","option"),"4"===R.major&&(_.a.className="dropdown-item"),_.subtext.className="text-muted",_.text=_.span.cloneNode(!1),_.text.className="text",_.checkMark=_.span.cloneNode(!1);var G=new RegExp(B+"|"+M),q=new RegExp("^"+W+"$|"+N),K={li:function(e,t,i){var s=_.li.cloneNode(!1);return e&&(1===e.nodeType||11===e.nodeType?s.appendChild(e):s.innerHTML=e),void 0!==t&&""!==t&&(s.className=t),null!=i&&s.classList.add("optgroup-"+i),s},a:function(e,t,i){var s=_.a.cloneNode(!0);return e&&(11===e.nodeType?s.appendChild(e):s.insertAdjacentHTML("beforeend",e)),void 0!==t&&""!==t&&s.classList.add.apply(s.classList,t.split(" ")),i&&s.setAttribute("style",i),s},text:function(e,t){var i,s,n=_.text.cloneNode(!1);if(e.content)n.innerHTML=e.content;else{if(n.textContent=e.text,e.icon){var o=_.whitespace.cloneNode(!1);(s=(!0===t?_.i:_.span).cloneNode(!1)).className=this.options.iconBase+" "+e.icon,_.fragment.appendChild(s),_.fragment.appendChild(o)}e.subtext&&((i=_.subtext.cloneNode(!1)).textContent=e.subtext,n.appendChild(i))}if(!0===t)for(;0<n.childNodes.length;)_.fragment.appendChild(n.childNodes[0]);else _.fragment.appendChild(n);return _.fragment},label:function(e){var t,i,s=_.text.cloneNode(!1);if(s.innerHTML=e.display,e.icon){var n=_.whitespace.cloneNode(!1);(i=_.span.cloneNode(!1)).className=this.options.iconBase+" "+e.icon,_.fragment.appendChild(i),_.fragment.appendChild(n)}return e.subtext&&((t=_.subtext.cloneNode(!1)).textContent=e.subtext,s.appendChild(t)),_.fragment.appendChild(s),_.fragment}},Y=function(e,t){var i=this;p.useDefault||(z.valHooks.select.set=p._set,p.useDefault=!0),this.$element=z(e),this.$newElement=null,this.$button=null,this.$menu=null,this.options=t,this.selectpicker={main:{},search:{},current:{},view:{},isSearching:!1,keydown:{keyHistory:"",resetKeyHistory:{start:function(){return setTimeout(function(){i.selectpicker.keydown.keyHistory=""},800)}}}},this.sizeInfo={},null===this.options.title&&(this.options.title=this.$element.attr("title"));var s=this.options.windowPadding;"number"==typeof s&&(this.options.windowPadding=[s,s,s,s]),this.val=Y.prototype.val,this.render=Y.prototype.render,this.refresh=Y.prototype.refresh,this.setStyle=Y.prototype.setStyle,this.selectAll=Y.prototype.selectAll,this.deselectAll=Y.prototype.deselectAll,this.destroy=Y.prototype.destroy,this.remove=Y.prototype.remove,this.show=Y.prototype.show,this.hide=Y.prototype.hide,this.init()};function Z(e){var l,a=arguments,c=e;if([].shift.apply(a),!R.success){try{R.full=(z.fn.dropdown.Constructor.VERSION||"").split(" ")[0].split(".")}catch(e){Y.BootstrapVersion?R.full=Y.BootstrapVersion.split(" ")[0].split("."):(R.full=[R.major,"0","0"],console.warn("There was an issue retrieving Bootstrap's version. Ensure Bootstrap is being loaded before bootstrap-select and there is no namespace collision. If loading Bootstrap asynchronously, the version may need to be manually specified via $.fn.selectpicker.Constructor.BootstrapVersion.",e))}R.major=R.full[0],R.success=!0}if("4"===R.major){var t=[];Y.DEFAULTS.style===V.BUTTONCLASS&&t.push({name:"style",className:"BUTTONCLASS"}),Y.DEFAULTS.iconBase===V.ICONBASE&&t.push({name:"iconBase",className:"ICONBASE"}),Y.DEFAULTS.tickIcon===V.TICKICON&&t.push({name:"tickIcon",className:"TICKICON"}),V.DIVIDER="dropdown-divider",V.SHOW="show",V.BUTTONCLASS="btn-light",V.POPOVERHEADER="popover-header",V.ICONBASE="",V.TICKICON="bs-ok-default";for(var i=0;i<t.length;i++){e=t[i];Y.DEFAULTS[e.name]=V[e.className]}}var s=this.each(function(){var e=z(this);if(e.is("select")){var t=e.data("selectpicker"),i="object"==typeof c&&c;if(t){if(i)for(var s in i)i.hasOwnProperty(s)&&(t.options[s]=i[s])}else{var n=e.data();for(var o in n)n.hasOwnProperty(o)&&-1!==z.inArray(o,d)&&delete n[o];var r=z.extend({},Y.DEFAULTS,z.fn.selectpicker.defaults||{},n,i);r.template=z.extend({},Y.DEFAULTS.template,z.fn.selectpicker.defaults?z.fn.selectpicker.defaults.template:{},n.template,i.template),e.data("selectpicker",t=new Y(this,r))}"string"==typeof c&&(l=t[c]instanceof Function?t[c].apply(t,a):t.options[c])}});return void 0!==l?l:s}Y.VERSION="1.13.14",Y.DEFAULTS={noneSelectedText:"Nothing selected",noneResultsText:"No results matched {0}",countSelectedText:function(e,t){return 1==e?"{0} item selected":"{0} items selected"},maxOptionsText:function(e,t){return[1==e?"Limit reached ({n} item max)":"Limit reached ({n} items max)",1==t?"Group limit reached ({n} item max)":"Group limit reached ({n} items max)"]},selectAllText:"Select All",deselectAllText:"Deselect All",doneButton:!1,doneButtonText:"Close",multipleSeparator:", ",styleBase:"btn",style:V.BUTTONCLASS,size:"auto",title:null,selectedTextFormat:"values",width:!1,container:!1,hideDisabled:!1,showSubtext:!1,showIcon:!0,showContent:!0,dropupAuto:!0,header:!1,liveSearch:!1,liveSearchPlaceholder:null,liveSearchNormalize:!1,liveSearchStyle:"contains",actionsBox:!1,iconBase:V.ICONBASE,tickIcon:V.TICKICON,showTick:!1,template:{caret:'<span class="caret"></span>'},maxOptions:!1,mobile:!1,selectOnTab:!1,dropdownAlignRight:!1,windowPadding:0,virtualScroll:600,display:!1,sanitize:!0,sanitizeFn:null,whiteList:e},Y.prototype={constructor:Y,init:function(){var i=this,e=this.$element.attr("id");U++,this.selectId="bs-select-"+U,this.$element[0].classList.add("bs-select-hidden"),this.multiple=this.$element.prop("multiple"),this.autofocus=this.$element.prop("autofocus"),this.$element[0].classList.contains("show-tick")&&(this.options.showTick=!0),this.$newElement=this.createDropdown(),this.buildData(),this.$element.after(this.$newElement).prependTo(this.$newElement),this.$button=this.$newElement.children("button"),this.$menu=this.$newElement.children(F.MENU),this.$menuInner=this.$menu.children(".inner"),this.$searchbox=this.$menu.find("input"),this.$element[0].classList.remove("bs-select-hidden"),!0===this.options.dropdownAlignRight&&this.$menu[0].classList.add(V.MENURIGHT),void 0!==e&&this.$button.attr("data-id",e),this.checkDisabled(),this.clickListener(),this.options.liveSearch?(this.liveSearchListener(),this.focusedParent=this.$searchbox[0]):this.focusedParent=this.$menuInner[0],this.setStyle(),this.render(),this.setWidth(),this.options.container?this.selectPosition():this.$element.on("hide"+j,function(){if(i.isVirtual()){var e=i.$menuInner[0],t=e.firstChild.cloneNode(!1);e.replaceChild(t,e.firstChild),e.scrollTop=0}}),this.$menu.data("this",this),this.$newElement.data("this",this),this.options.mobile&&this.mobile(),this.$newElement.on({"hide.bs.dropdown":function(e){i.$element.trigger("hide"+j,e)},"hidden.bs.dropdown":function(e){i.$element.trigger("hidden"+j,e)},"show.bs.dropdown":function(e){i.$element.trigger("show"+j,e)},"shown.bs.dropdown":function(e){i.$element.trigger("shown"+j,e)}}),i.$element[0].hasAttribute("required")&&this.$element.on("invalid"+j,function(){i.$button[0].classList.add("bs-invalid"),i.$element.on("shown"+j+".invalid",function(){i.$element.val(i.$element.val()).off("shown"+j+".invalid")}).on("rendered"+j,function(){this.validity.valid&&i.$button[0].classList.remove("bs-invalid"),i.$element.off("rendered"+j)}),i.$button.on("blur"+j,function(){i.$element.trigger("focus").trigger("blur"),i.$button.off("blur"+j)})}),setTimeout(function(){i.buildList(),i.$element.trigger("loaded"+j)})},createDropdown:function(){var e=this.multiple||this.options.showTick?" show-tick":"",t=this.multiple?' aria-multiselectable="true"':"",i="",s=this.autofocus?" autofocus":"";R.major<4&&this.$element.parent().hasClass("input-group")&&(i=" input-group-btn");var n,o="",r="",l="",a="";return this.options.header&&(o='<div class="'+V.POPOVERHEADER+'"><button type="button" class="close" aria-hidden="true">&times;</button>'+this.options.header+"</div>"),this.options.liveSearch&&(r='<div class="bs-searchbox"><input type="search" class="form-control" autocomplete="off"'+(null===this.options.liveSearchPlaceholder?"":' placeholder="'+S(this.options.liveSearchPlaceholder)+'"')+' role="combobox" aria-label="Search" aria-controls="'+this.selectId+'" aria-autocomplete="list"></div>'),this.multiple&&this.options.actionsBox&&(l='<div class="bs-actionsbox"><div class="btn-group btn-group-sm btn-block"><button type="button" class="actions-btn bs-select-all btn '+V.BUTTONCLASS+'">'+this.options.selectAllText+'</button><button type="button" class="actions-btn bs-deselect-all btn '+V.BUTTONCLASS+'">'+this.options.deselectAllText+"</button></div></div>"),this.multiple&&this.options.doneButton&&(a='<div class="bs-donebutton"><div class="btn-group btn-block"><button type="button" class="btn btn-sm '+V.BUTTONCLASS+'">'+this.options.doneButtonText+"</button></div></div>"),n='<div class="dropdown bootstrap-select'+e+i+'"><button type="button" class="'+this.options.styleBase+' dropdown-toggle" '+("static"===this.options.display?'data-display="static"':"")+'data-toggle="dropdown"'+s+' role="combobox" aria-owns="'+this.selectId+'" aria-haspopup="listbox" aria-expanded="false"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner"></div></div> </div>'+("4"===R.major?"":'<span class="bs-caret">'+this.options.template.caret+"</span>")+'</button><div class="'+V.MENU+" "+("4"===R.major?"":V.SHOW)+'">'+o+r+l+'<div class="inner '+V.SHOW+'" role="listbox" id="'+this.selectId+'" tabindex="-1" '+t+'><ul class="'+V.MENU+" inner "+("4"===R.major?V.SHOW:"")+'" role="presentation"></ul></div>'+a+"</div></div>",z(n)},setPositionData:function(){this.selectpicker.view.canHighlight=[];for(var e=this.selectpicker.view.size=0;e<this.selectpicker.current.data.length;e++){var t=this.selectpicker.current.data[e],i=!0;"divider"===t.type?(i=!1,t.height=this.sizeInfo.dividerHeight):"optgroup-label"===t.type?(i=!1,t.height=this.sizeInfo.dropdownHeaderHeight):t.height=this.sizeInfo.liHeight,t.disabled&&(i=!1),this.selectpicker.view.canHighlight.push(i),i&&(this.selectpicker.view.size++,t.posinset=this.selectpicker.view.size),t.position=(0===e?0:this.selectpicker.current.data[e-1].position)+t.height}},isVirtual:function(){return!1!==this.options.virtualScroll&&this.selectpicker.main.elements.length>=this.options.virtualScroll||!0===this.options.virtualScroll},createView:function(A,e,t){var L,N,D=this,i=0,H=[];if(this.selectpicker.isSearching=A,this.selectpicker.current=A?this.selectpicker.search:this.selectpicker.main,this.setPositionData(),e)if(t)i=this.$menuInner[0].scrollTop;else if(!D.multiple){var s=D.$element[0],n=(s.options[s.selectedIndex]||{}).liIndex;if("number"==typeof n&&!1!==D.options.size){var o=D.selectpicker.main.data[n],r=o&&o.position;r&&(i=r-(D.sizeInfo.menuInnerHeight+D.sizeInfo.liHeight)/2)}}function l(e,t){var i,s,n,o,r,l,a,c,d=D.selectpicker.current.elements.length,h=[],p=!0,u=D.isVirtual();D.selectpicker.view.scrollTop=e,i=Math.ceil(D.sizeInfo.menuInnerHeight/D.sizeInfo.liHeight*1.5),s=Math.round(d/i)||1;for(var f=0;f<s;f++){var m=(f+1)*i;if(f===s-1&&(m=d),h[f]=[f*i+(f?1:0),m],!d)break;void 0===r&&e-1<=D.selectpicker.current.data[m-1].position-D.sizeInfo.menuInnerHeight&&(r=f)}if(void 0===r&&(r=0),l=[D.selectpicker.view.position0,D.selectpicker.view.position1],n=Math.max(0,r-1),o=Math.min(s-1,r+1),D.selectpicker.view.position0=!1===u?0:Math.max(0,h[n][0])||0,D.selectpicker.view.position1=!1===u?d:Math.min(d,h[o][1])||0,a=l[0]!==D.selectpicker.view.position0||l[1]!==D.selectpicker.view.position1,void 0!==D.activeIndex&&(N=D.selectpicker.main.elements[D.prevActiveIndex],H=D.selectpicker.main.elements[D.activeIndex],L=D.selectpicker.main.elements[D.selectedIndex],t&&(D.activeIndex!==D.selectedIndex&&D.defocusItem(H),D.activeIndex=void 0),D.activeIndex&&D.activeIndex!==D.selectedIndex&&D.defocusItem(L)),void 0!==D.prevActiveIndex&&D.prevActiveIndex!==D.activeIndex&&D.prevActiveIndex!==D.selectedIndex&&D.defocusItem(N),(t||a)&&(c=D.selectpicker.view.visibleElements?D.selectpicker.view.visibleElements.slice():[],D.selectpicker.view.visibleElements=!1===u?D.selectpicker.current.elements:D.selectpicker.current.elements.slice(D.selectpicker.view.position0,D.selectpicker.view.position1),D.setOptionStatus(),(A||!1===u&&t)&&(p=!function(e,i){return e.length===i.length&&e.every(function(e,t){return e===i[t]})}(c,D.selectpicker.view.visibleElements)),(t||!0===u)&&p)){var v,g,b=D.$menuInner[0],w=document.createDocumentFragment(),I=b.firstChild.cloneNode(!1),x=D.selectpicker.view.visibleElements,k=[];b.replaceChild(I,b.firstChild);f=0;for(var y=x.length;f<y;f++){var $,S,E=x[f];D.options.sanitize&&($=E.lastChild)&&(S=D.selectpicker.current.data[f+D.selectpicker.view.position0])&&S.content&&!S.sanitized&&(k.push($),S.sanitized=!0),w.appendChild(E)}if(D.options.sanitize&&k.length&&P(k,D.options.whiteList,D.options.sanitizeFn),!0===u?(v=0===D.selectpicker.view.position0?0:D.selectpicker.current.data[D.selectpicker.view.position0-1].position,g=D.selectpicker.view.position1>d-1?0:D.selectpicker.current.data[d-1].position-D.selectpicker.current.data[D.selectpicker.view.position1-1].position,b.firstChild.style.marginTop=v+"px",b.firstChild.style.marginBottom=g+"px"):(b.firstChild.style.marginTop=0,b.firstChild.style.marginBottom=0),b.firstChild.appendChild(w),!0===u&&D.sizeInfo.hasScrollBar){var C=b.firstChild.offsetWidth;if(t&&C<D.sizeInfo.menuInnerInnerWidth&&D.sizeInfo.totalMenuWidth>D.sizeInfo.selectWidth)b.firstChild.style.minWidth=D.sizeInfo.menuInnerInnerWidth+"px";else if(C>D.sizeInfo.menuInnerInnerWidth){D.$menu[0].style.minWidth=0;var O=b.firstChild.offsetWidth;O>D.sizeInfo.menuInnerInnerWidth&&(D.sizeInfo.menuInnerInnerWidth=O,b.firstChild.style.minWidth=D.sizeInfo.menuInnerInnerWidth+"px"),D.$menu[0].style.minWidth=""}}}if(D.prevActiveIndex=D.activeIndex,D.options.liveSearch){if(A&&t){var z,T=0;D.selectpicker.view.canHighlight[T]||(T=1+D.selectpicker.view.canHighlight.slice(1).indexOf(!0)),z=D.selectpicker.view.visibleElements[T],D.defocusItem(D.selectpicker.view.currentActive),D.activeIndex=(D.selectpicker.current.data[T]||{}).index,D.focusItem(z)}}else D.$menuInner.trigger("focus")}l(i,!0),this.$menuInner.off("scroll.createView").on("scroll.createView",function(e,t){D.noScroll||l(this.scrollTop,t),D.noScroll=!1}),z(window).off("resize"+j+"."+this.selectId+".createView").on("resize"+j+"."+this.selectId+".createView",function(){D.$newElement.hasClass(V.SHOW)&&l(D.$menuInner[0].scrollTop)})},focusItem:function(e,t,i){if(e){t=t||this.selectpicker.main.data[this.activeIndex];var s=e.firstChild;s&&(s.setAttribute("aria-setsize",this.selectpicker.view.size),s.setAttribute("aria-posinset",t.posinset),!0!==i&&(this.focusedParent.setAttribute("aria-activedescendant",s.id),e.classList.add("active"),s.classList.add("active")))}},defocusItem:function(e){e&&(e.classList.remove("active"),e.firstChild&&e.firstChild.classList.remove("active"))},setPlaceholder:function(){var e=!1;if(this.options.title&&!this.multiple){this.selectpicker.view.titleOption||(this.selectpicker.view.titleOption=document.createElement("option")),e=!0;var t=this.$element[0],i=!1,s=!this.selectpicker.view.titleOption.parentNode;if(s)this.selectpicker.view.titleOption.className="bs-title-option",this.selectpicker.view.titleOption.value="",i=void 0===z(t.options[t.selectedIndex]).attr("selected")&&void 0===this.$element.data("selected");!s&&0===this.selectpicker.view.titleOption.index||t.insertBefore(this.selectpicker.view.titleOption,t.firstChild),i&&(t.selectedIndex=0)}return e},buildData:function(){var p=':not([hidden]):not([data-hidden="true"])',u=[],f=0,e=this.setPlaceholder()?1:0;this.options.hideDisabled&&(p+=":not(:disabled)");var t=this.$element[0].querySelectorAll("select > *"+p);function m(e){var t=u[u.length-1];t&&"divider"===t.type&&(t.optID||e.optID)||((e=e||{}).type="divider",u.push(e))}function v(e,t){if((t=t||{}).divider="true"===e.getAttribute("data-divider"),t.divider)m({optID:t.optID});else{var i=u.length,s=e.style.cssText,n=s?S(s):"",o=(e.className||"")+(t.optgroupClass||"");t.optID&&(o="opt "+o),t.optionClass=o.trim(),t.inlineStyle=n,t.text=e.textContent,t.content=e.getAttribute("data-content"),t.tokens=e.getAttribute("data-tokens"),t.subtext=e.getAttribute("data-subtext"),t.icon=e.getAttribute("data-icon"),e.liIndex=i,t.display=t.content||t.text,t.type="option",t.index=i,t.option=e,t.selected=!!e.selected,t.disabled=t.disabled||!!e.disabled,u.push(t)}}function i(e,t){var i=t[e],s=t[e-1],n=t[e+1],o=i.querySelectorAll("option"+p);if(o.length){var r,l,a={display:S(i.label),subtext:i.getAttribute("data-subtext"),icon:i.getAttribute("data-icon"),type:"optgroup-label",optgroupClass:" "+(i.className||"")};f++,s&&m({optID:f}),a.optID=f,u.push(a);for(var c=0,d=o.length;c<d;c++){var h=o[c];0===c&&(l=(r=u.length-1)+d),v(h,{headerIndex:r,lastIndex:l,optID:a.optID,optgroupClass:a.optgroupClass,disabled:i.disabled})}n&&m({optID:f})}}for(var s=t.length;e<s;e++){var n=t[e];"OPTGROUP"!==n.tagName?v(n,{}):i(e,t)}this.selectpicker.main.data=this.selectpicker.current.data=u},buildList:function(){var s=this,e=this.selectpicker.main.data,n=[],o=0;function t(e){var t,i=0;switch(e.type){case"divider":t=K.li(!1,V.DIVIDER,e.optID?e.optID+"div":void 0);break;case"option":(t=K.li(K.a(K.text.call(s,e),e.optionClass,e.inlineStyle),"",e.optID)).firstChild&&(t.firstChild.id=s.selectId+"-"+e.index);break;case"optgroup-label":t=K.li(K.label.call(s,e),"dropdown-header"+e.optgroupClass,e.optID)}n.push(t),e.display&&(i+=e.display.length),e.subtext&&(i+=e.subtext.length),e.icon&&(i+=1),o<i&&(o=i,s.selectpicker.view.widestOption=n[n.length-1])}!s.options.showTick&&!s.multiple||_.checkMark.parentNode||(_.checkMark.className=this.options.iconBase+" "+s.options.tickIcon+" check-mark",_.a.appendChild(_.checkMark));for(var i=e.length,r=0;r<i;r++){t(e[r])}this.selectpicker.main.elements=this.selectpicker.current.elements=n},findLis:function(){return this.$menuInner.find(".inner > li")},render:function(){var e,t=this,i=this.$element[0],s=this.setPlaceholder()&&0===i.selectedIndex,n=O(i,this.options.hideDisabled),o=n.length,r=this.$button[0],l=r.querySelector(".filter-option-inner-inner"),a=document.createTextNode(this.options.multipleSeparator),c=_.fragment.cloneNode(!1),d=!1;if(r.classList.toggle("bs-placeholder",t.multiple?!o:!T(i,n)),this.tabIndex(),"static"===this.options.selectedTextFormat)c=K.text.call(this,{text:this.options.title},!0);else if(!1===(this.multiple&&-1!==this.options.selectedTextFormat.indexOf("count")&&1<o&&(1<(e=this.options.selectedTextFormat.split(">")).length&&o>e[1]||1===e.length&&2<=o))){if(!s){for(var h=0;h<o&&h<50;h++){var p=n[h],u=this.selectpicker.main.data[p.liIndex],f={};this.multiple&&0<h&&c.appendChild(a.cloneNode(!1)),p.title?f.text=p.title:u&&(u.content&&t.options.showContent?(f.content=u.content.toString(),d=!0):(t.options.showIcon&&(f.icon=u.icon),t.options.showSubtext&&!t.multiple&&u.subtext&&(f.subtext=" "+u.subtext),f.text=p.textContent.trim())),c.appendChild(K.text.call(this,f,!0))}49<o&&c.appendChild(document.createTextNode("..."))}}else{var m=':not([hidden]):not([data-hidden="true"]):not([data-divider="true"])';this.options.hideDisabled&&(m+=":not(:disabled)");var v=this.$element[0].querySelectorAll("select > option"+m+", optgroup"+m+" option"+m).length,g="function"==typeof this.options.countSelectedText?this.options.countSelectedText(o,v):this.options.countSelectedText;c=K.text.call(this,{text:g.replace("{0}",o.toString()).replace("{1}",v.toString())},!0)}if(null==this.options.title&&(this.options.title=this.$element.attr("title")),c.childNodes.length||(c=K.text.call(this,{text:void 0!==this.options.title?this.options.title:this.options.noneSelectedText},!0)),r.title=c.textContent.replace(/<[^>]*>?/g,"").trim(),this.options.sanitize&&d&&P([c],t.options.whiteList,t.options.sanitizeFn),l.innerHTML="",l.appendChild(c),R.major<4&&this.$newElement[0].classList.contains("bs3-has-addon")){var b=r.querySelector(".filter-expand"),w=l.cloneNode(!0);w.className="filter-expand",b?r.replaceChild(w,b):r.appendChild(w)}this.$element.trigger("rendered"+j)},setStyle:function(e,t){var i,s=this.$button[0],n=this.$newElement[0],o=this.options.style.trim();this.$element.attr("class")&&this.$newElement.addClass(this.$element.attr("class").replace(/selectpicker|mobile-device|bs-select-hidden|validate\[.*\]/gi,"")),R.major<4&&(n.classList.add("bs3"),n.parentNode.classList.contains("input-group")&&(n.previousElementSibling||n.nextElementSibling)&&(n.previousElementSibling||n.nextElementSibling).classList.contains("input-group-addon")&&n.classList.add("bs3-has-addon")),i=e?e.trim():o,"add"==t?i&&s.classList.add.apply(s.classList,i.split(" ")):"remove"==t?i&&s.classList.remove.apply(s.classList,i.split(" ")):(o&&s.classList.remove.apply(s.classList,o.split(" ")),i&&s.classList.add.apply(s.classList,i.split(" ")))},liHeight:function(e){if(e||!1!==this.options.size&&!Object.keys(this.sizeInfo).length){var t=document.createElement("div"),i=document.createElement("div"),s=document.createElement("div"),n=document.createElement("ul"),o=document.createElement("li"),r=document.createElement("li"),l=document.createElement("li"),a=document.createElement("a"),c=document.createElement("span"),d=this.options.header&&0<this.$menu.find("."+V.POPOVERHEADER).length?this.$menu.find("."+V.POPOVERHEADER)[0].cloneNode(!0):null,h=this.options.liveSearch?document.createElement("div"):null,p=this.options.actionsBox&&this.multiple&&0<this.$menu.find(".bs-actionsbox").length?this.$menu.find(".bs-actionsbox")[0].cloneNode(!0):null,u=this.options.doneButton&&this.multiple&&0<this.$menu.find(".bs-donebutton").length?this.$menu.find(".bs-donebutton")[0].cloneNode(!0):null,f=this.$element.find("option")[0];if(this.sizeInfo.selectWidth=this.$newElement[0].offsetWidth,c.className="text",a.className="dropdown-item "+(f?f.className:""),t.className=this.$menu[0].parentNode.className+" "+V.SHOW,t.style.width=0,"auto"===this.options.width&&(i.style.minWidth=0),i.className=V.MENU+" "+V.SHOW,s.className="inner "+V.SHOW,n.className=V.MENU+" inner "+("4"===R.major?V.SHOW:""),o.className=V.DIVIDER,r.className="dropdown-header",c.appendChild(document.createTextNode("\u200b")),a.appendChild(c),l.appendChild(a),r.appendChild(c.cloneNode(!0)),this.selectpicker.view.widestOption&&n.appendChild(this.selectpicker.view.widestOption.cloneNode(!0)),n.appendChild(l),n.appendChild(o),n.appendChild(r),d&&i.appendChild(d),h){var m=document.createElement("input");h.className="bs-searchbox",m.className="form-control",h.appendChild(m),i.appendChild(h)}p&&i.appendChild(p),s.appendChild(n),i.appendChild(s),u&&i.appendChild(u),t.appendChild(i),document.body.appendChild(t);var v,g=l.offsetHeight,b=r?r.offsetHeight:0,w=d?d.offsetHeight:0,I=h?h.offsetHeight:0,x=p?p.offsetHeight:0,k=u?u.offsetHeight:0,y=z(o).outerHeight(!0),$=!!window.getComputedStyle&&window.getComputedStyle(i),S=i.offsetWidth,E=$?null:z(i),C={vert:L($?$.paddingTop:E.css("paddingTop"))+L($?$.paddingBottom:E.css("paddingBottom"))+L($?$.borderTopWidth:E.css("borderTopWidth"))+L($?$.borderBottomWidth:E.css("borderBottomWidth")),horiz:L($?$.paddingLeft:E.css("paddingLeft"))+L($?$.paddingRight:E.css("paddingRight"))+L($?$.borderLeftWidth:E.css("borderLeftWidth"))+L($?$.borderRightWidth:E.css("borderRightWidth"))},O={vert:C.vert+L($?$.marginTop:E.css("marginTop"))+L($?$.marginBottom:E.css("marginBottom"))+2,horiz:C.horiz+L($?$.marginLeft:E.css("marginLeft"))+L($?$.marginRight:E.css("marginRight"))+2};s.style.overflowY="scroll",v=i.offsetWidth-S,document.body.removeChild(t),this.sizeInfo.liHeight=g,this.sizeInfo.dropdownHeaderHeight=b,this.sizeInfo.headerHeight=w,this.sizeInfo.searchHeight=I,this.sizeInfo.actionsHeight=x,this.sizeInfo.doneButtonHeight=k,this.sizeInfo.dividerHeight=y,this.sizeInfo.menuPadding=C,this.sizeInfo.menuExtras=O,this.sizeInfo.menuWidth=S,this.sizeInfo.menuInnerInnerWidth=S-C.horiz,this.sizeInfo.totalMenuWidth=this.sizeInfo.menuWidth,this.sizeInfo.scrollBarWidth=v,this.sizeInfo.selectHeight=this.$newElement[0].offsetHeight,this.setPositionData()}},getSelectPosition:function(){var e,t=z(window),i=this.$newElement.offset(),s=z(this.options.container);this.options.container&&s.length&&!s.is("body")?((e=s.offset()).top+=parseInt(s.css("borderTopWidth")),e.left+=parseInt(s.css("borderLeftWidth"))):e={top:0,left:0};var n=this.options.windowPadding;this.sizeInfo.selectOffsetTop=i.top-e.top-t.scrollTop(),this.sizeInfo.selectOffsetBot=t.height()-this.sizeInfo.selectOffsetTop-this.sizeInfo.selectHeight-e.top-n[2],this.sizeInfo.selectOffsetLeft=i.left-e.left-t.scrollLeft(),this.sizeInfo.selectOffsetRight=t.width()-this.sizeInfo.selectOffsetLeft-this.sizeInfo.selectWidth-e.left-n[1],this.sizeInfo.selectOffsetTop-=n[0],this.sizeInfo.selectOffsetLeft-=n[3]},setMenuSize:function(e){this.getSelectPosition();var t,i,s,n,o,r,l,a,c=this.sizeInfo.selectWidth,d=this.sizeInfo.liHeight,h=this.sizeInfo.headerHeight,p=this.sizeInfo.searchHeight,u=this.sizeInfo.actionsHeight,f=this.sizeInfo.doneButtonHeight,m=this.sizeInfo.dividerHeight,v=this.sizeInfo.menuPadding,g=0;if(this.options.dropupAuto&&(l=d*this.selectpicker.current.elements.length+v.vert,a=this.sizeInfo.selectOffsetTop-this.sizeInfo.selectOffsetBot>this.sizeInfo.menuExtras.vert&&l+this.sizeInfo.menuExtras.vert+50>this.sizeInfo.selectOffsetBot,!0===this.selectpicker.isSearching&&(a=this.selectpicker.dropup),this.$newElement.toggleClass(V.DROPUP,a),this.selectpicker.dropup=a),"auto"===this.options.size)n=3<this.selectpicker.current.elements.length?3*this.sizeInfo.liHeight+this.sizeInfo.menuExtras.vert-2:0,i=this.sizeInfo.selectOffsetBot-this.sizeInfo.menuExtras.vert,s=n+h+p+u+f,r=Math.max(n-v.vert,0),this.$newElement.hasClass(V.DROPUP)&&(i=this.sizeInfo.selectOffsetTop-this.sizeInfo.menuExtras.vert),t=(o=i)-h-p-u-f-v.vert;else if(this.options.size&&"auto"!=this.options.size&&this.selectpicker.current.elements.length>this.options.size){for(var b=0;b<this.options.size;b++)"divider"===this.selectpicker.current.data[b].type&&g++;t=(i=d*this.options.size+g*m+v.vert)-v.vert,o=i+h+p+u+f,s=r=""}this.$menu.css({"max-height":o+"px",overflow:"hidden","min-height":s+"px"}),this.$menuInner.css({"max-height":t+"px","overflow-y":"auto","min-height":r+"px"}),this.sizeInfo.menuInnerHeight=Math.max(t,1),this.selectpicker.current.data.length&&this.selectpicker.current.data[this.selectpicker.current.data.length-1].position>this.sizeInfo.menuInnerHeight&&(this.sizeInfo.hasScrollBar=!0,this.sizeInfo.totalMenuWidth=this.sizeInfo.menuWidth+this.sizeInfo.scrollBarWidth),"auto"===this.options.dropdownAlignRight&&this.$menu.toggleClass(V.MENURIGHT,this.sizeInfo.selectOffsetLeft>this.sizeInfo.selectOffsetRight&&this.sizeInfo.selectOffsetRight<this.sizeInfo.totalMenuWidth-c),this.dropdown&&this.dropdown._popper&&this.dropdown._popper.update()},setSize:function(e){if(this.liHeight(e),this.options.header&&this.$menu.css("padding-top",0),!1!==this.options.size){var t=this,i=z(window);this.setMenuSize(),this.options.liveSearch&&this.$searchbox.off("input.setMenuSize propertychange.setMenuSize").on("input.setMenuSize propertychange.setMenuSize",function(){return t.setMenuSize()}),"auto"===this.options.size?i.off("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize").on("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize",function(){return t.setMenuSize()}):this.options.size&&"auto"!=this.options.size&&this.selectpicker.current.elements.length>this.options.size&&i.off("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize")}this.createView(!1,!0,e)},setWidth:function(){var i=this;"auto"===this.options.width?requestAnimationFrame(function(){i.$menu.css("min-width","0"),i.$element.on("loaded"+j,function(){i.liHeight(),i.setMenuSize();var e=i.$newElement.clone().appendTo("body"),t=e.css("width","auto").children("button").outerWidth();e.remove(),i.sizeInfo.selectWidth=Math.max(i.sizeInfo.totalMenuWidth,t),i.$newElement.css("width",i.sizeInfo.selectWidth+"px")})}):"fit"===this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width","").addClass("fit-width")):this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width",this.options.width)):(this.$menu.css("min-width",""),this.$newElement.css("width","")),this.$newElement.hasClass("fit-width")&&"fit"!==this.options.width&&this.$newElement[0].classList.remove("fit-width")},selectPosition:function(){this.$bsContainer=z('<div class="bs-container" />');function e(e){var t={},i=r.options.display||!!z.fn.dropdown.Constructor.Default&&z.fn.dropdown.Constructor.Default.display;r.$bsContainer.addClass(e.attr("class").replace(/form-control|fit-width/gi,"")).toggleClass(V.DROPUP,e.hasClass(V.DROPUP)),s=e.offset(),l.is("body")?n={top:0,left:0}:((n=l.offset()).top+=parseInt(l.css("borderTopWidth"))-l.scrollTop(),n.left+=parseInt(l.css("borderLeftWidth"))-l.scrollLeft()),o=e.hasClass(V.DROPUP)?0:e[0].offsetHeight,(R.major<4||"static"===i)&&(t.top=s.top-n.top+o,t.left=s.left-n.left),t.width=e[0].offsetWidth,r.$bsContainer.css(t)}var s,n,o,r=this,l=z(this.options.container);this.$button.on("click.bs.dropdown.data-api",function(){r.isDisabled()||(e(r.$newElement),r.$bsContainer.appendTo(r.options.container).toggleClass(V.SHOW,!r.$button.hasClass(V.SHOW)).append(r.$menu))}),z(window).off("resize"+j+"."+this.selectId+" scroll"+j+"."+this.selectId).on("resize"+j+"."+this.selectId+" scroll"+j+"."+this.selectId,function(){r.$newElement.hasClass(V.SHOW)&&e(r.$newElement)}),this.$element.on("hide"+j,function(){r.$menu.data("height",r.$menu.height()),r.$bsContainer.detach()})},setOptionStatus:function(e){var t=this;if(t.noScroll=!1,t.selectpicker.view.visibleElements&&t.selectpicker.view.visibleElements.length)for(var i=0;i<t.selectpicker.view.visibleElements.length;i++){var s=t.selectpicker.current.data[i+t.selectpicker.view.position0],n=s.option;n&&(!0!==e&&t.setDisabled(s.index,s.disabled),t.setSelected(s.index,n.selected))}},setSelected:function(e,t){var i,s,n=this.selectpicker.main.elements[e],o=this.selectpicker.main.data[e],r=void 0!==this.activeIndex,l=this.activeIndex===e||t&&!this.multiple&&!r;o.selected=t,s=n.firstChild,t&&(this.selectedIndex=e),n.classList.toggle("selected",t),l?(this.focusItem(n,o),this.selectpicker.view.currentActive=n,this.activeIndex=e):this.defocusItem(n),s&&(s.classList.toggle("selected",t),t?s.setAttribute("aria-selected",!0):this.multiple?s.setAttribute("aria-selected",!1):s.removeAttribute("aria-selected")),l||r||!t||void 0===this.prevActiveIndex||(i=this.selectpicker.main.elements[this.prevActiveIndex],this.defocusItem(i))},setDisabled:function(e,t){var i,s=this.selectpicker.main.elements[e];this.selectpicker.main.data[e].disabled=t,i=s.firstChild,s.classList.toggle(V.DISABLED,t),i&&("4"===R.major&&i.classList.toggle(V.DISABLED,t),t?(i.setAttribute("aria-disabled",t),i.setAttribute("tabindex",-1)):(i.removeAttribute("aria-disabled"),i.setAttribute("tabindex",0)))},isDisabled:function(){return this.$element[0].disabled},checkDisabled:function(){this.isDisabled()?(this.$newElement[0].classList.add(V.DISABLED),this.$button.addClass(V.DISABLED).attr("tabindex",-1).attr("aria-disabled",!0)):(this.$button[0].classList.contains(V.DISABLED)&&(this.$newElement[0].classList.remove(V.DISABLED),this.$button.removeClass(V.DISABLED).attr("aria-disabled",!1)),-1!=this.$button.attr("tabindex")||this.$element.data("tabindex")||this.$button.removeAttr("tabindex"))},tabIndex:function(){this.$element.data("tabindex")!==this.$element.attr("tabindex")&&-98!==this.$element.attr("tabindex")&&"-98"!==this.$element.attr("tabindex")&&(this.$element.data("tabindex",this.$element.attr("tabindex")),this.$button.attr("tabindex",this.$element.data("tabindex"))),this.$element.attr("tabindex",-98)},clickListener:function(){var C=this,t=z(document);function e(){C.options.liveSearch?C.$searchbox.trigger("focus"):C.$menuInner.trigger("focus")}function i(){C.dropdown&&C.dropdown._popper&&C.dropdown._popper.state.isCreated?e():requestAnimationFrame(i)}t.data("spaceSelect",!1),this.$button.on("keyup",function(e){/(32)/.test(e.keyCode.toString(10))&&t.data("spaceSelect")&&(e.preventDefault(),t.data("spaceSelect",!1))}),this.$newElement.on("show.bs.dropdown",function(){3<R.major&&!C.dropdown&&(C.dropdown=C.$button.data("bs.dropdown"),C.dropdown._menu=C.$menu[0])}),this.$button.on("click.bs.dropdown.data-api",function(){C.$newElement.hasClass(V.SHOW)||C.setSize()}),this.$element.on("shown"+j,function(){C.$menuInner[0].scrollTop!==C.selectpicker.view.scrollTop&&(C.$menuInner[0].scrollTop=C.selectpicker.view.scrollTop),3<R.major?requestAnimationFrame(i):e()}),this.$menuInner.on("mouseenter","li a",function(e){var t=this.parentElement,i=C.isVirtual()?C.selectpicker.view.position0:0,s=Array.prototype.indexOf.call(t.parentElement.children,t),n=C.selectpicker.current.data[s+i];C.focusItem(t,n,!0)}),this.$menuInner.on("click","li a",function(e,t){var i=z(this),s=C.$element[0],n=C.isVirtual()?C.selectpicker.view.position0:0,o=C.selectpicker.current.data[i.parent().index()+n],r=o.index,l=T(s),a=s.selectedIndex,c=s.options[a],d=!0;if(C.multiple&&1!==C.options.maxOptions&&e.stopPropagation(),e.preventDefault(),!C.isDisabled()&&!i.parent().hasClass(V.DISABLED)){var h=o.option,p=z(h),u=h.selected,f=p.parent("optgroup"),m=f.find("option"),v=C.options.maxOptions,g=f.data("maxOptions")||!1;if(r===C.activeIndex&&(t=!0),t||(C.prevActiveIndex=C.activeIndex,C.activeIndex=void 0),C.multiple){if(h.selected=!u,C.setSelected(r,!u),i.trigger("blur"),!1!==v||!1!==g){var b=v<O(s).length,w=g<f.find("option:selected").length;if(v&&b||g&&w)if(v&&1==v)s.selectedIndex=-1,h.selected=!0,C.setOptionStatus(!0);else if(g&&1==g){for(var I=0;I<m.length;I++){var x=m[I];x.selected=!1,C.setSelected(x.liIndex,!1)}h.selected=!0,C.setSelected(r,!0)}else{var k="string"==typeof C.options.maxOptionsText?[C.options.maxOptionsText,C.options.maxOptionsText]:C.options.maxOptionsText,y="function"==typeof k?k(v,g):k,$=y[0].replace("{n}",v),S=y[1].replace("{n}",g),E=z('<div class="notify"></div>');y[2]&&($=$.replace("{var}",y[2][1<v?0:1]),S=S.replace("{var}",y[2][1<g?0:1])),h.selected=!1,C.$menu.append(E),v&&b&&(E.append(z("<div>"+$+"</div>")),d=!1,C.$element.trigger("maxReached"+j)),g&&w&&(E.append(z("<div>"+S+"</div>")),d=!1,C.$element.trigger("maxReachedGrp"+j)),setTimeout(function(){C.setSelected(r,!1)},10),E[0].classList.add("fadeOut"),setTimeout(function(){E.remove()},1050)}}}else c&&(c.selected=!1),h.selected=!0,C.setSelected(r,!0);!C.multiple||C.multiple&&1===C.options.maxOptions?C.$button.trigger("focus"):C.options.liveSearch&&C.$searchbox.trigger("focus"),d&&(!C.multiple&&a===s.selectedIndex||(A=[h.index,p.prop("selected"),l],C.$element.triggerNative("change")))}}),this.$menu.on("click","li."+V.DISABLED+" a, ."+V.POPOVERHEADER+", ."+V.POPOVERHEADER+" :not(.close)",function(e){e.currentTarget==this&&(e.preventDefault(),e.stopPropagation(),C.options.liveSearch&&!z(e.target).hasClass("close")?C.$searchbox.trigger("focus"):C.$button.trigger("focus"))}),this.$menuInner.on("click",".divider, .dropdown-header",function(e){e.preventDefault(),e.stopPropagation(),C.options.liveSearch?C.$searchbox.trigger("focus"):C.$button.trigger("focus")}),this.$menu.on("click","."+V.POPOVERHEADER+" .close",function(){C.$button.trigger("click")}),this.$searchbox.on("click",function(e){e.stopPropagation()}),this.$menu.on("click",".actions-btn",function(e){C.options.liveSearch?C.$searchbox.trigger("focus"):C.$button.trigger("focus"),e.preventDefault(),e.stopPropagation(),z(this).hasClass("bs-select-all")?C.selectAll():C.deselectAll()}),this.$element.on("change"+j,function(){C.render(),C.$element.trigger("changed"+j,A),A=null}).on("focus"+j,function(){C.options.mobile||C.$button.trigger("focus")})},liveSearchListener:function(){var u=this,f=document.createElement("li");this.$button.on("click.bs.dropdown.data-api",function(){u.$searchbox.val()&&u.$searchbox.val("")}),this.$searchbox.on("click.bs.dropdown.data-api focus.bs.dropdown.data-api touchend.bs.dropdown.data-api",function(e){e.stopPropagation()}),this.$searchbox.on("input propertychange",function(){var e=u.$searchbox.val();if(u.selectpicker.search.elements=[],u.selectpicker.search.data=[],e){var t=[],i=e.toUpperCase(),s={},n=[],o=u._searchStyle(),r=u.options.liveSearchNormalize;r&&(i=w(i));for(var l=0;l<u.selectpicker.main.data.length;l++){var a=u.selectpicker.main.data[l];s[l]||(s[l]=k(a,i,o,r)),s[l]&&void 0!==a.headerIndex&&-1===n.indexOf(a.headerIndex)&&(0<a.headerIndex&&(s[a.headerIndex-1]=!0,n.push(a.headerIndex-1)),s[a.headerIndex]=!0,n.push(a.headerIndex),s[a.lastIndex+1]=!0),s[l]&&"optgroup-label"!==a.type&&n.push(l)}l=0;for(var c=n.length;l<c;l++){var d=n[l],h=n[l-1],p=(a=u.selectpicker.main.data[d],u.selectpicker.main.data[h]);("divider"!==a.type||"divider"===a.type&&p&&"divider"!==p.type&&c-1!==l)&&(u.selectpicker.search.data.push(a),t.push(u.selectpicker.main.elements[d]))}u.activeIndex=void 0,u.noScroll=!0,u.$menuInner.scrollTop(0),u.selectpicker.search.elements=t,u.createView(!0),t.length||(f.className="no-results",f.innerHTML=u.options.noneResultsText.replace("{0}",'"'+S(e)+'"'),u.$menuInner[0].firstChild.appendChild(f))}else u.$menuInner.scrollTop(0),u.createView(!1)})},_searchStyle:function(){return this.options.liveSearchStyle||"contains"},val:function(e){var t=this.$element[0];if(void 0===e)return this.$element.val();var i=T(t);if(A=[null,null,i],this.$element.val(e).trigger("changed"+j,A),this.$newElement.hasClass(V.SHOW))if(this.multiple)this.setOptionStatus(!0);else{var s=(t.options[t.selectedIndex]||{}).liIndex;"number"==typeof s&&(this.setSelected(this.selectedIndex,!1),this.setSelected(s,!0))}return this.render(),A=null,this.$element},changeAll:function(e){if(this.multiple){void 0===e&&(e=!0);var t=this.$element[0],i=0,s=0,n=T(t);t.classList.add("bs-select-hidden");for(var o=0,r=this.selectpicker.current.data,l=r.length;o<l;o++){var a=r[o],c=a.option;c&&!a.disabled&&"divider"!==a.type&&(a.selected&&i++,!0===(c.selected=e)&&s++)}t.classList.remove("bs-select-hidden"),i!==s&&(this.setOptionStatus(),A=[null,null,n],this.$element.triggerNative("change"))}},selectAll:function(){return this.changeAll(!0)},deselectAll:function(){return this.changeAll(!1)},toggle:function(e){(e=e||window.event)&&e.stopPropagation(),this.$button.trigger("click.bs.dropdown.data-api")},keydown:function(e){var t,i,s,n,o,r=z(this),l=r.hasClass("dropdown-toggle"),a=(l?r.closest(".dropdown"):r.closest(F.MENU)).data("this"),c=a.findLis(),d=!1,h=e.which===W&&!l&&!a.options.selectOnTab,p=G.test(e.which)||h,u=a.$menuInner[0].scrollTop,f=!0===a.isVirtual()?a.selectpicker.view.position0:0;if(!(112<=e.which&&e.which<=123))if(!(i=a.$newElement.hasClass(V.SHOW))&&(p||48<=e.which&&e.which<=57||96<=e.which&&e.which<=105||65<=e.which&&e.which<=90)&&(a.$button.trigger("click.bs.dropdown.data-api"),a.options.liveSearch))a.$searchbox.trigger("focus");else{if(e.which===N&&i&&(e.preventDefault(),a.$button.trigger("click.bs.dropdown.data-api").trigger("focus")),p){if(!c.length)return;-1!==(t=(s=a.selectpicker.main.elements[a.activeIndex])?Array.prototype.indexOf.call(s.parentElement.children,s):-1)&&a.defocusItem(s),e.which===B?(-1!==t&&t--,t+f<0&&(t+=c.length),a.selectpicker.view.canHighlight[t+f]||-1===(t=a.selectpicker.view.canHighlight.slice(0,t+f).lastIndexOf(!0)-f)&&(t=c.length-1)):e.which!==M&&!h||(++t+f>=a.selectpicker.view.canHighlight.length&&(t=0),a.selectpicker.view.canHighlight[t+f]||(t=t+1+a.selectpicker.view.canHighlight.slice(t+f+1).indexOf(!0))),e.preventDefault();var m=f+t;e.which===B?0===f&&t===c.length-1?(a.$menuInner[0].scrollTop=a.$menuInner[0].scrollHeight,m=a.selectpicker.current.elements.length-1):d=(o=(n=a.selectpicker.current.data[m]).position-n.height)<u:e.which!==M&&!h||(0===t?m=a.$menuInner[0].scrollTop=0:d=u<(o=(n=a.selectpicker.current.data[m]).position-a.sizeInfo.menuInnerHeight)),s=a.selectpicker.current.elements[m],a.activeIndex=a.selectpicker.current.data[m].index,a.focusItem(s),a.selectpicker.view.currentActive=s,d&&(a.$menuInner[0].scrollTop=o),a.options.liveSearch?a.$searchbox.trigger("focus"):r.trigger("focus")}else if(!r.is("input")&&!q.test(e.which)||e.which===H&&a.selectpicker.keydown.keyHistory){var v,g,b=[];e.preventDefault(),a.selectpicker.keydown.keyHistory+=C[e.which],a.selectpicker.keydown.resetKeyHistory.cancel&&clearTimeout(a.selectpicker.keydown.resetKeyHistory.cancel),a.selectpicker.keydown.resetKeyHistory.cancel=a.selectpicker.keydown.resetKeyHistory.start(),g=a.selectpicker.keydown.keyHistory,/^(.)\1+$/.test(g)&&(g=g.charAt(0));for(var w=0;w<a.selectpicker.current.data.length;w++){var I=a.selectpicker.current.data[w];k(I,g,"startsWith",!0)&&a.selectpicker.view.canHighlight[w]&&b.push(I.index)}if(b.length){var x=0;c.removeClass("active").find("a").removeClass("active"),1===g.length&&(-1===(x=b.indexOf(a.activeIndex))||x===b.length-1?x=0:x++),v=b[x],d=0<u-(n=a.selectpicker.main.data[v]).position?(o=n.position-n.height,!0):(o=n.position-a.sizeInfo.menuInnerHeight,n.position>u+a.sizeInfo.menuInnerHeight),s=a.selectpicker.main.elements[v],a.activeIndex=b[x],a.focusItem(s),s&&s.firstChild.focus(),d&&(a.$menuInner[0].scrollTop=o),r.trigger("focus")}}i&&(e.which===H&&!a.selectpicker.keydown.keyHistory||e.which===D||e.which===W&&a.options.selectOnTab)&&(e.which!==H&&e.preventDefault(),a.options.liveSearch&&e.which===H||(a.$menuInner.find(".active a").trigger("click",!0),r.trigger("focus"),a.options.liveSearch||(e.preventDefault(),z(document).data("spaceSelect",!0))))}},mobile:function(){this.$element[0].classList.add("mobile-device")},refresh:function(){var e=z.extend({},this.options,this.$element.data());this.options=e,this.checkDisabled(),this.setStyle(),this.render(),this.buildData(),this.buildList(),this.setWidth(),this.setSize(!0),this.$element.trigger("refreshed"+j)},hide:function(){this.$newElement.hide()},show:function(){this.$newElement.show()},remove:function(){this.$newElement.remove(),this.$element.remove()},destroy:function(){this.$newElement.before(this.$element).remove(),this.$bsContainer?this.$bsContainer.remove():this.$menu.remove(),this.$element.off(j).removeData("selectpicker").removeClass("bs-select-hidden selectpicker"),z(window).off(j+"."+this.selectId)}};var J=z.fn.selectpicker;z.fn.selectpicker=Z,z.fn.selectpicker.Constructor=Y,z.fn.selectpicker.noConflict=function(){return z.fn.selectpicker=J,this};var Q=z.fn.dropdown.Constructor._dataApiKeydownHandler||z.fn.dropdown.Constructor.prototype.keydown;z(document).off("keydown.bs.dropdown.data-api").on("keydown.bs.dropdown.data-api",':not(.bootstrap-select) > [data-toggle="dropdown"]',Q).on("keydown.bs.dropdown.data-api",":not(.bootstrap-select) > .dropdown-menu",Q).on("keydown"+j,'.bootstrap-select [data-toggle="dropdown"], .bootstrap-select [role="listbox"], .bootstrap-select .bs-searchbox input',Y.prototype.keydown).on("focusin.modal",'.bootstrap-select [data-toggle="dropdown"], .bootstrap-select [role="listbox"], .bootstrap-select .bs-searchbox input',function(e){e.stopPropagation()}),z(window).on("load"+j+".data-api",function(){z(".selectpicker").each(function(){var e=z(this);Z.call(e,e.data())})})}(e)});
+//# sourceMappingURL=bootstrap-select.min.js.map
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-cs.min.js b/cps/static/js/libs/bootstrap-select/defaults-cs.min.js
new file mode 100644
index 00000000..be309a10
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-cs.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,n){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return n(e)}):"object"==typeof module&&module.exports?module.exports=n(require("jquery")):n(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Vyberte ze seznamu",noneResultsText:"Pro hled\xe1n\xed {0} nebyly nalezeny \u017e\xe1dn\xe9 v\xfdsledky",countSelectedText:"Vybran\xe9 {0} z {1}",maxOptionsText:["Limit p\u0159ekro\u010den ({n} {var} max)","Limit skupiny p\u0159ekro\u010den ({n} {var} max)",["polo\u017eek","polo\u017eka"]],multipleSeparator:", ",selectAllText:"Vybrat v\u0161e",deselectAllText:"Zru\u0161it v\xfdb\u011br"}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-de.min.js b/cps/static/js/libs/bootstrap-select/defaults-de.min.js
new file mode 100644
index 00000000..e625440b
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-de.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Bitte w\xe4hlen...",noneResultsText:"Keine Ergebnisse f\xfcr {0}",countSelectedText:function(e,t){return 1==e?"{0} Element ausgew\xe4hlt":"{0} Elemente ausgew\xe4hlt"},maxOptionsText:function(e,t){return[1==e?"Limit erreicht ({n} Element max.)":"Limit erreicht ({n} Elemente max.)",1==t?"Gruppen-Limit erreicht ({n} Element max.)":"Gruppen-Limit erreicht ({n} Elemente max.)"]},selectAllText:"Alles ausw\xe4hlen",deselectAllText:"Nichts ausw\xe4hlen",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-es.min.js b/cps/static/js/libs/bootstrap-select/defaults-es.min.js
new file mode 100644
index 00000000..25efec39
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-es.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,o){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return o(e)}):"object"==typeof module&&module.exports?module.exports=o(require("jquery")):o(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"No hay selecci\xf3n",noneResultsText:"No hay resultados {0}",countSelectedText:"Seleccionados {0} de {1}",maxOptionsText:["L\xedmite alcanzado ({n} {var} max)","L\xedmite del grupo alcanzado({n} {var} max)",["elementos","element"]],multipleSeparator:", ",selectAllText:"Seleccionar Todos",deselectAllText:"Desmarcar Todos"}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-fi.min.js b/cps/static/js/libs/bootstrap-select/defaults-fi.min.js
new file mode 100644
index 00000000..bee14048
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-fi.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Ei valintoja",noneResultsText:"Ei hakutuloksia {0}",countSelectedText:function(e,t){return 1==e?"{0} valittu":"{0} valitut"},maxOptionsText:function(e,t){return["Valintojen maksimim\xe4\xe4r\xe4 ({n} saavutettu)","Ryhm\xe4n maksimim\xe4\xe4r\xe4 ({n} saavutettu)"]},selectAllText:"Valitse kaikki",deselectAllText:"Poista kaikki",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-fr.min.js b/cps/static/js/libs/bootstrap-select/defaults-fr.min.js
new file mode 100644
index 00000000..d8931590
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-fr.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Aucune s\xe9lection",noneResultsText:"Aucun r\xe9sultat pour {0}",countSelectedText:function(e,t){return 1<e?"{0} \xe9l\xe9ments s\xe9lectionn\xe9s":"{0} \xe9l\xe9ment s\xe9lectionn\xe9"},maxOptionsText:function(e,t){return[1<e?"Limite atteinte ({n} \xe9l\xe9ments max)":"Limite atteinte ({n} \xe9l\xe9ment max)",1<t?"Limite du groupe atteinte ({n} \xe9l\xe9ments max)":"Limite du groupe atteinte ({n} \xe9l\xe9ment max)"]},multipleSeparator:", ",selectAllText:"Tout s\xe9lectionner",deselectAllText:"Tout d\xe9s\xe9lectionner"}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-hu.min.js b/cps/static/js/libs/bootstrap-select/defaults-hu.min.js
new file mode 100644
index 00000000..d96b9e80
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-hu.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"V\xe1lasszon!",noneResultsText:"Nincs tal\xe1lat {0}",countSelectedText:function(e,t){return"{0} elem kiv\xe1lasztva"},maxOptionsText:function(e,t){return["Legfeljebb {n} elem v\xe1laszthat\xf3","A csoportban legfeljebb {n} elem v\xe1laszthat\xf3"]},selectAllText:"Mind",deselectAllText:"Egyik sem",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-it.min.js b/cps/static/js/libs/bootstrap-select/defaults-it.min.js
new file mode 100644
index 00000000..d54bea68
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-it.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Nessuna selezione",noneResultsText:"Nessun risultato per {0}",countSelectedText:function(e,t){return 1==e?"Selezionato {0} di {1}":"Selezionati {0} di {1}"},maxOptionsText:["Limite raggiunto ({n} {var} max)","Limite del gruppo raggiunto ({n} {var} max)",["elementi","elemento"]],multipleSeparator:", ",selectAllText:"Seleziona Tutto",deselectAllText:"Deseleziona Tutto"}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-ja.min.js b/cps/static/js/libs/bootstrap-select/defaults-ja.min.js
new file mode 100644
index 00000000..93efcb63
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-ja.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093",noneResultsText:"'{0}'\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093",countSelectedText:"{0}/{1} \u9078\u629e\u4e2d",maxOptionsText:["\u9078\u629e\u4e0a\u9650\u6570\u3092\u8d85\u3048\u3066\u3044\u307e\u3059(\u6700\u5927{n}{var})","\u30b0\u30eb\u30fc\u30d7\u306e\u9078\u629e\u4e0a\u9650\u6570\u3092\u8d85\u3048\u3066\u3044\u307e\u3059(\u6700\u5927{n}{var})",["\u30a2\u30a4\u30c6\u30e0","\u30a2\u30a4\u30c6\u30e0"]],selectAllText:"\u5168\u3066\u9078\u629e",deselectAllText:"\u9078\u629e\u3092\u30af\u30ea\u30a2",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-km.min.js b/cps/static/js/libs/bootstrap-select/defaults-km.min.js
new file mode 100644
index 00000000..aa73f80d
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-km.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"\u1798\u17b7\u1793\u1798\u17b6\u1793\u17a2\u17d2\u179c\u17b8\u1794\u17b6\u1793\u1787\u17d2\u179a\u17be\u179f\u179a\u17be\u179f",noneResultsText:"\u1798\u17b7\u1793\u1798\u17b6\u1793\u179b\u1791\u17d2\u1792\u1795\u179b {0}",countSelectedText:function(e,t){return"{0} \u1792\u17b6\u178f\u17bb\u178a\u17c2\u179b\u1794\u17b6\u1793\u1787\u17d2\u179a\u17be\u179f"},maxOptionsText:function(e,t){return[1==e?"\u1788\u17b6\u1793\u178a\u179b\u17cb\u178a\u17c2\u1793\u1780\u17c6\u178e\u178f\u17cb ( {n} \u1792\u17b6\u178f\u17bb\u17a2\u178f\u17b7\u1794\u179a\u1798\u17b6)":"\u17a2\u178f\u17b7\u1794\u179a\u1798\u17b6\u1788\u17b6\u1793\u178a\u179b\u17cb\u178a\u17c2\u1793\u1780\u17c6\u178e\u178f\u17cb ( {n} \u1792\u17b6\u178f\u17bb)",1==t?"\u178a\u17c2\u1793\u1780\u17c6\u178e\u178f\u17cb\u1780\u17d2\u179a\u17bb\u1798\u1788\u17b6\u1793\u178a\u179b\u17cb ( {n} \u17a2\u178f\u17b7\u1794\u179a\u1798\u17b6\u1792\u17b6\u178f\u17bb)":"\u17a2\u178f\u17b7\u1794\u179a\u1798\u17b6\u1780\u17d2\u179a\u17bb\u1798\u1788\u17b6\u1793\u178a\u179b\u17cb\u178a\u17c2\u1793\u1780\u17c6\u178e\u178f\u17cb ( {n} \u1792\u17b6\u178f\u17bb)"]},selectAllText:"\u1787\u17d2\u179a\u17be\u179f\u200b\u1799\u1780\u200b\u1791\u17b6\u17c6\u1784\u17a2\u179f\u17cb",deselectAllText:"\u1798\u17b7\u1793\u1787\u17d2\u179a\u17be\u179f\u200b\u1799\u1780\u200b\u1791\u17b6\u17c6\u1784\u17a2\u179f",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-nl.min.js b/cps/static/js/libs/bootstrap-select/defaults-nl.min.js
new file mode 100644
index 00000000..6f153de8
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-nl.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Niets geselecteerd",noneResultsText:"Geen resultaten gevonden voor {0}",countSelectedText:"{0} van {1} geselecteerd",maxOptionsText:["Limiet bereikt ({n} {var} max)","Groep limiet bereikt ({n} {var} max)",["items","item"]],selectAllText:"Alles selecteren",deselectAllText:"Alles deselecteren",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-pl.min.js b/cps/static/js/libs/bootstrap-select/defaults-pl.min.js
new file mode 100644
index 00000000..157bee10
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-pl.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,n){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return n(e)}):"object"==typeof module&&module.exports?module.exports=n(require("jquery")):n(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Nic nie zaznaczono",noneResultsText:"Brak wynik\xf3w wyszukiwania {0}",countSelectedText:"Zaznaczono {0} z {1}",maxOptionsText:["Osi\u0105gni\u0119to limit ({n} {var} max)","Limit grupy osi\u0105gni\u0119ty ({n} {var} max)",["elementy","element"]],selectAllText:"Zaznacz wszystkie",deselectAllText:"Odznacz wszystkie",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-ru.min.js b/cps/static/js/libs/bootstrap-select/defaults-ru.min.js
new file mode 100644
index 00000000..738ba3a9
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-ru.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"\u041d\u0438\u0447\u0435\u0433\u043e \u043d\u0435 \u0432\u044b\u0431\u0440\u0430\u043d\u043e",noneResultsText:"\u0421\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e {0}",countSelectedText:"\u0412\u044b\u0431\u0440\u0430\u043d\u043e {0} \u0438\u0437 {1}",maxOptionsText:["\u0414\u043e\u0441\u0442\u0438\u0433\u043d\u0443\u0442 \u043f\u0440\u0435\u0434\u0435\u043b ({n} {var} \u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c)","\u0414\u043e\u0441\u0442\u0438\u0433\u043d\u0443\u0442 \u043f\u0440\u0435\u0434\u0435\u043b \u0432 \u0433\u0440\u0443\u043f\u043f\u0435 ({n} {var} \u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c)",["\u0448\u0442.","\u0448\u0442."]],doneButtonText:"\u0417\u0430\u043a\u0440\u044b\u0442\u044c",selectAllText:"\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0435",deselectAllText:"\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0435",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-sv.min.js b/cps/static/js/libs/bootstrap-select/defaults-sv.min.js
new file mode 100644
index 00000000..8fbd80d8
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-sv.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Inget valt",noneResultsText:"Inget s\xf6kresultat matchar {0}",countSelectedText:function(e,t){return 1===e?"{0} alternativ valt":"{0} alternativ valda"},maxOptionsText:function(e,t){return["Gr\xe4ns uppn\xe5d (max {n} alternativ)","Gr\xe4ns uppn\xe5d (max {n} gruppalternativ)"]},selectAllText:"Markera alla",deselectAllText:"Avmarkera alla",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-tr.min.js b/cps/static/js/libs/bootstrap-select/defaults-tr.min.js
new file mode 100644
index 00000000..0cc2ad97
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-tr.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,i){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return i(e)}):"object"==typeof module&&module.exports?module.exports=i(require("jquery")):i(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"Hi\xe7biri se\xe7ilmedi",noneResultsText:"Hi\xe7bir sonu\xe7 bulunamad\u0131 {0}",countSelectedText:function(e,i){return"{0} \xf6\u011fe se\xe7ildi"},maxOptionsText:function(e,i){return[1==e?"Limit a\u015f\u0131ld\u0131 (maksimum {n} say\u0131da \xf6\u011fe )":"Limit a\u015f\u0131ld\u0131 (maksimum {n} say\u0131da \xf6\u011fe)","Grup limiti a\u015f\u0131ld\u0131 (maksimum {n} say\u0131da \xf6\u011fe)"]},selectAllText:"T\xfcm\xfcn\xfc Se\xe7",deselectAllText:"Se\xe7iniz",multipleSeparator:", "}});
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-select/defaults-zh_Hans_CN.min.js b/cps/static/js/libs/bootstrap-select/defaults-zh_Hans_CN.min.js
new file mode 100644
index 00000000..a63c60c3
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-select/defaults-zh_Hans_CN.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"\u6ca1\u6709\u9009\u4e2d\u4efb\u4f55\u9879",noneResultsText:"\u6ca1\u6709\u627e\u5230\u5339\u914d\u9879",countSelectedText:"\u9009\u4e2d{1}\u4e2d\u7684{0}\u9879",maxOptionsText:["\u8d85\u51fa\u9650\u5236 (\u6700\u591a\u9009\u62e9{n}\u9879)","\u7ec4\u9009\u62e9\u8d85\u51fa\u9650\u5236(\u6700\u591a\u9009\u62e9{n}\u7ec4)"],multipleSeparator:", ",selectAllText:"\u5168\u9009",deselectAllText:"\u53d6\u6d88\u5168\u9009"}});
\ No newline at end of file
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 703ecb29..d891d30e 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -110,6 +110,34 @@ $(document).ready(function() {
   }
 });
 
+function ConfirmDialog(id, dataValue, yesFn, noFn) {
+    var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
+    var path = src.substring(0, src.lastIndexOf("/"));
+    var $confirm = $("#GeneralDeleteModal");
+    // var dataValue= e.data('value'); // target.data('value');
+    $confirm.modal('show');
+    $.ajax({
+        method:"get",
+        dataType: "json",
+        url: path + "/../../ajax/loaddialogtexts/" + id,
+        success: function success(data) {
+            $("#header").html(data.header);
+            $("#text").html(data.main);
+        }
+    });
+
+
+    $("#btnConfirmYes").off('click').click(function () {
+        yesFn(dataValue);
+        $confirm.modal("hide");
+    });
+    $("#btnConfirmNo").off('click').click(function () {
+        if (typeof noFn !== 'undefined') {
+            noFn(dataValue);
+        }
+        $confirm.modal("hide");
+    });
+}
 
 $("#delete_confirm").click(function() {
     //get data-id attribute of the clicked element
@@ -213,6 +241,56 @@ $(function() {
         });
     }
 
+    function fillFileTable(path, type, folder, filt) {
+        if (window.location.pathname.endsWith("/basicconfig")) {
+            var request_path = "/../basicconfig/pathchooser/";
+        } else {
+            var request_path = "/../../ajax/pathchooser/";
+        }
+        $.ajax({
+            dataType: "json",
+            data: {
+                path: path,
+                folder: folder,
+                filter: filt
+            },
+            url: window.location.pathname + request_path,
+            success: function success(data) {
+                if ($("#element_selected").text() ==="") {
+                    $("#element_selected").text(data.cwd);
+                }
+                $("#file_table > tbody > tr").each(function () {
+                    if ($(this).attr("id") !== "parent") {
+                        $(this).closest("tr").remove();
+                    } else {
+                        if(data.absolute && data.parentdir !== "") {
+                           $(this)[0].attributes['data-path'].value  = data.parentdir;
+                        } else {
+                            $(this)[0].attributes['data-path'].value  = "..";
+                        }
+                    }
+                });
+                if (data.parentdir !== "") {
+                    $("#parent").removeClass('hidden')
+                } else {
+                    $("#parent").addClass('hidden')
+                }
+                // console.log(data);
+                data.files.forEach(function(entry) {
+                    if(entry.type === "dir") {
+                        var type = "<span class=\"glyphicon glyphicon-folder-close\"></span>";
+                } else {
+                    var type = "";
+                }
+                    $("<tr class=\"tr-clickable\" data-type=\"" + entry.type + "\" data-path=\"" +
+                        entry.fullpath + "\"><td>" + type + "</td><td>" + entry.name + "</td><td>" +
+                        entry.size + "</td></tr>").appendTo($("#file_table"));
+                });
+            },
+            timeout: 2000
+        });
+    }
+
     $(".discover .row").isotope({
         // options
         itemSelector : ".book",
@@ -402,18 +480,98 @@ $(function() {
             $("#config_delete_kobo_token").show();
         });
 
-    $("#btndeletetoken").click(function() {
-        //get data-id attribute of the clicked element
-        var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
-        var path = src.substring(0, src.lastIndexOf("/"));
-        // var domainId = $(this).value("domainId");
-        $.ajax({
-            method:"get",
-            url: path + "/../../kobo_auth/deleteauthtoken/" + this.value,
-        });
-        $("#modalDeleteToken").modal("hide");
-        $("#config_delete_kobo_token").hide();
+    $("#config_delete_kobo_token").click(function() {
+        ConfirmDialog(
+            $(this).attr('id'),
+            $(this).data('value'),
+            function (value) {
+                var pathname = document.getElementsByTagName("script");
+                var src = pathname[pathname.length - 1].src;
+                var path = src.substring(0, src.lastIndexOf("/"));
+                $.ajax({
+                    method: "get",
+                    url: path + "/../../kobo_auth/deleteauthtoken/" + value,
+                });
+                $("#config_delete_kobo_token").hide();
+            }
+        );
+    });
 
+    $("#toggle_order_shelf").click(function() {
+        $("#new").toggleClass("disabled");
+        $("#old").toggleClass("disabled");
+        $("#asc").toggleClass("disabled");
+        $("#desc").toggleClass("disabled");
+        $("#auth_az").toggleClass("disabled");
+        $("#auth_za").toggleClass("disabled");
+        $("#pub_new").toggleClass("disabled");
+        $("#pub_old").toggleClass("disabled");
+        var alternative_text = $("#toggle_order_shelf").data('alt-text');
+        $("#toggle_order_shelf")[0].attributes['data-alt-text'].value = $("#toggle_order_shelf").html();
+        $("#toggle_order_shelf").html(alternative_text);
+    });
+
+    $("#btndeluser").click(function() {
+        ConfirmDialog(
+            $(this).attr('id'),
+            $(this).data('value'),
+            function(value){
+                var subform = $('#user_submit').closest("form");
+                subform.submit(function(eventObj) {
+                    $(this).append('<input type="hidden" name="delete" value="True" />');
+                    return true;
+                });
+                subform.submit();
+            }
+        );
+    });
+    $("#user_submit").click(function() {
+        this.closest("form").submit();
+    });
+
+    $("#delete_shelf").click(function() {
+        ConfirmDialog(
+            $(this).attr('id'),
+            $(this).data('value'),
+            function(value){
+                window.location.href = window.location.pathname + "/../../shelf/delete/" + value
+            }
+        );
+
+    });
+
+
+    $("#fileModal").on("show.bs.modal", function(e) {
+        var target = $(e.relatedTarget);
+        var path = $("#" + target.data("link"))[0].value;
+        var folder = target.data("folderonly");
+        var filter = target.data("filefilter");
+        $("#element_selected").text(path);
+        $("#file_confirm")[0].attributes["data-link"].value = target.data("link");
+        $("#file_confirm")[0].attributes["data-folderonly"].value = (typeof folder === 'undefined') ? false : true;
+        $("#file_confirm")[0].attributes["data-filefilter"].value = (typeof filter === 'undefined') ? "" : filter;
+        $("#file_confirm")[0].attributes["data-newfile"].value = target.data("newfile");
+        fillFileTable(path,"dir", folder, filter);
+    });
+
+    $("#file_confirm").click(function() {
+        $("#" + $(this).data("link"))[0].value = $("#element_selected").text()
+    });
+
+    $(document).on("click", ".tr-clickable", function() {
+        var path = this.attributes["data-path"].value;
+        var type = this.attributes["data-type"].value;
+        var folder = $(file_confirm).data("folderonly");
+        var filter = $(file_confirm).data("filefilter");
+        var newfile = $(file_confirm).data("newfile");
+        if (newfile !== 'undefined') {
+            $("#element_selected").text(path + $("#new_file".text()));
+        } else {
+            $("#element_selected").text(path);
+        }
+        if(type === "dir") {
+            fillFileTable(path, type, folder, filter);
+        }
     });
 
     $(window).resize(function() {
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 62f7e220..efe0fad4 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -45,14 +45,13 @@ $(function() {
             if (selections.length < 1) {
                 $("#delete_selection").addClass("disabled");
                 $("#delete_selection").attr("aria-disabled", true);
-            }
-            else{
+            } else {
                 $("#delete_selection").removeClass("disabled");
                 $("#delete_selection").attr("aria-disabled", false);
             }
         });
     $("#delete_selection").click(function() {
-        $("#books-table").bootstrapTable('uncheckAll');
+        $("#books-table").bootstrapTable("uncheckAll");
     });
 
     $("#merge_confirm").click(function() {
@@ -63,8 +62,8 @@ $(function() {
             url: window.location.pathname + "/../../ajax/mergebooks",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success() {
-                $('#books-table').bootstrapTable('refresh');
-                $("#books-table").bootstrapTable('uncheckAll');
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
             }
         });
     });
@@ -76,11 +75,11 @@ $(function() {
             dataType: "json",
             url: window.location.pathname + "/../../ajax/simulatemerge",
             data: JSON.stringify({"Merge_books":selections}),
-            success: function success(book_titles) {
-                $.each(book_titles.from, function(i, item) {
+            success: function success(booTitles) {
+                $.each(booTitles.from, function(i, item) {
                     $("<span>- " + item + "</span>").appendTo("#merge_from");
                 });
-                $('#merge_to').text("- " + book_titles.to);
+                $("#merge_to").text("- " + booTitles.to);
 
             }
         });
@@ -126,34 +125,35 @@ $(function() {
         formatNoMatches: function () {
             return "";
         },
+        // eslint-disable-next-line no-unused-vars
         onEditableSave: function (field, row, oldvalue, $el) {
-        if (field === 'title' || field === 'authors') {
-            $.ajax({
-                method:"get",
-                dataType: "json",
-                url: window.location.pathname + "/../../ajax/sort_value/" + field + '/' + row.id,
-                success: function success(data) {
-                    var key = Object.keys(data)[0]
-                    $("#books-table").bootstrapTable('updateCellByUniqueId', {
-                        id: row.id,
-                        field: key,
-                        value: data[key]
-                    });
-                    console.log(data);
-                }
-            });
-         }
+            if (field === "title" || field === "authors") {
+                $.ajax({
+                    method:"get",
+                    dataType: "json",
+                    url: window.location.pathname + "/../../ajax/sort_value/" + field + "/" + row.id,
+                    success: function success(data) {
+                        var key = Object.keys(data)[0];
+                        $("#books-table").bootstrapTable("updateCellByUniqueId", {
+                            id: row.id,
+                            field: key,
+                            value: data[key]
+                        });
+                        // console.log(data);
+                    }
+                });
+            }
         },
+        // eslint-disable-next-line no-unused-vars
         onColumnSwitch: function (field, checked) {
-            var visible = $("#books-table").bootstrapTable('getVisibleColumns');
-            var hidden  = $("#books-table").bootstrapTable('getHiddenColumns');
-            var visibility =[]
-             var st = ""
+            var visible = $("#books-table").bootstrapTable("getVisibleColumns");
+            var hidden  = $("#books-table").bootstrapTable("getHiddenColumns");
+            var st = "";
             visible.forEach(function(item) {
-                st += "\""+ item.field + "\":\"" +"true"+ "\","
+                st += "\"" + item.field + "\":\"" + "true" + "\",";
             });
             hidden.forEach(function(item) {
-                st += "\""+ item.field + "\":\"" +"false"+ "\","
+                st += "\"" + item.field + "\":\"" + "false" + "\",";
             });
             st = st.slice(0, -1);
             $.ajax({
@@ -208,15 +208,13 @@ $(function() {
         },
         striped: false
     });
-    $("#btndeletedomain").click(function() {
-        //get data-id attribute of the clicked element
-        var domainId = $(this).data("domainId");
+
+    function domain_handle(domainId) {
         $.ajax({
             method:"post",
             url: window.location.pathname + "/../../ajax/deletedomain",
             data: {"domainid":domainId}
         });
-        $("#DeleteDomain").modal("hide");
         $.ajax({
             method:"get",
             url: window.location.pathname + "/../../ajax/domainlist/1",
@@ -235,12 +233,16 @@ $(function() {
                 $("#domain-deny-table").bootstrapTable("load", data);
             }
         });
+    }
+    $("#domain-allow-table").on("click-cell.bs.table", function (field, value, row, $element) {
+        if (value === 2) {
+            ConfirmDialog("btndeletedomain", $element.id, domain_handle);
+        }
     });
-    //triggered when modal is about to be shown
-    $("#DeleteDomain").on("show.bs.modal", function(e) {
-        //get data-id attribute of the clicked element and store in button
-        var domainId = $(e.relatedTarget).data("domain-id");
-        $(e.currentTarget).find("#btndeletedomain").data("domainId", domainId);
+    $("#domain-deny-table").on("click-cell.bs.table", function (field, value, row, $element) {
+        if (value === 2) {
+            ConfirmDialog("btndeletedomain", $element.id, domain_handle);
+        }
     });
 
     $("#restrictModal").on("hidden.bs.modal", function () {
@@ -253,14 +255,14 @@ $(function() {
         $("#h3").addClass("hidden");
         $("#h4").addClass("hidden");
     });
-    function startTable(type) {
+    function startTable(type, user_id) {
         var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
         var path = src.substring(0, src.lastIndexOf("/"));
         $("#restrict-elements-table").bootstrapTable({
             formatNoMatches: function () {
                 return "";
             },
-            url: path + "/../../ajax/listrestriction/" + type,
+            url: path + "/../../ajax/listrestriction/" + type + "/" + user_id,
             rowStyle: function(row) {
                 // console.log('Reihe :' + row + " Index :" + index);
                 if (row.id.charAt(0) === "a") {
@@ -274,13 +276,13 @@ $(function() {
                     $.ajax ({
                         type: "Post",
                         data: "id=" + row.id + "&type=" + row.type + "&Element=" + encodeURIComponent(row.Element),
-                        url: path + "/../../ajax/deleterestriction/" + type,
+                        url: path + "/../../ajax/deleterestriction/" + type + "/" + user_id,
                         async: true,
                         timeout: 900,
                         success:function() {
                             $.ajax({
                                 method:"get",
-                                url: path + "/../../ajax/listrestriction/" + type,
+                                url: path + "/../../ajax/listrestriction/" + type + "/" + user_id,
                                 async: true,
                                 timeout: 900,
                                 success:function(data) {
@@ -296,7 +298,7 @@ $(function() {
         $("#restrict-elements-table").removeClass("table-hover");
         $("#restrict-elements-table").on("editable-save.bs.table", function (e, field, row) {
             $.ajax({
-                url: path + "/../../ajax/editrestriction/" + type,
+                url: path + "/../../ajax/editrestriction/" + type + "/" + user_id,
                 type: "Post",
                 data: row
             });
@@ -304,13 +306,13 @@ $(function() {
         $("[id^=submit_]").click(function() {
             $(this)[0].blur();
             $.ajax({
-                url: path + "/../../ajax/addrestriction/" + type,
+                url: path + "/../../ajax/addrestriction/" + type + "/" + user_id,
                 type: "Post",
                 data: $(this).closest("form").serialize() + "&" + $(this)[0].name + "=",
                 success: function () {
                     $.ajax ({
                         method:"get",
-                        url: path + "/../../ajax/listrestriction/" + type,
+                        url: path + "/../../ajax/listrestriction/" + type + "/" + user_id,
                         async: true,
                         timeout: 900,
                         success:function(data) {
@@ -323,21 +325,21 @@ $(function() {
         });
     }
     $("#get_column_values").on("click", function() {
-        startTable(1);
+        startTable(1, 0);
         $("#h2").removeClass("hidden");
     });
 
     $("#get_tags").on("click", function() {
-        startTable(0);
+        startTable(0, 0);
         $("#h1").removeClass("hidden");
     });
     $("#get_user_column_values").on("click", function() {
-        startTable(3);
+        startTable(3, $(this).data('id'));
         $("#h4").removeClass("hidden");
     });
 
     $("#get_user_tags").on("click", function() {
-        startTable(2);
+        startTable(2,  $(this).data('id'));
         $(this)[0].blur();
         $("#h3").removeClass("hidden");
     });
@@ -347,7 +349,7 @@ $(function() {
 /* Function for deleting domain restrictions */
 function TableActions (value, row) {
     return [
-        "<a class=\"danger remove\" data-toggle=\"modal\" data-target=\"#DeleteDomain\" data-domain-id=\"" + row.id
+        "<a class=\"danger remove\"  data-value=\"" + row.id
         + "\" title=\"Remove\">",
         "<i class=\"glyphicon glyphicon-trash\"></i>",
         "</a>"
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 659c6e9c..75542b38 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -9,7 +9,7 @@ from shutil import copyfile
 from sqlalchemy.exc import SQLAlchemyError
 
 from cps.services.worker import CalibreTask
-from cps import calibre_db, db
+from cps import db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
@@ -33,8 +33,9 @@ class TaskConvert(CalibreTask):
     def run(self, worker_thread):
         self.worker_thread = worker_thread
         if config.config_use_google_drive:
-            cur_book = calibre_db.get_book(self.bookid)
-            data = calibre_db.get_book_format(self.bookid, self.settings['old_book_format'])
+            worker_db = db.CalibreDB(expire_on_commit=False)
+            cur_book = worker_db.get_book(self.bookid)
+            data = worker_db.get_book_format(self.bookid, self.settings['old_book_format'])
             df = gdriveutils.getFileFromEbooksFolder(cur_book.path,
                                                      data.name + "." + self.settings['old_book_format'].lower())
             if df:
@@ -44,10 +45,12 @@ class TaskConvert(CalibreTask):
                 if not os.path.exists(os.path.join(config.config_calibre_dir, cur_book.path)):
                     os.makedirs(os.path.join(config.config_calibre_dir, cur_book.path))
                 df.GetContentFile(datafile)
+                worker_db.session.close()
             else:
                 error_message = _(u"%(format)s not found on Google Drive: %(fn)s",
                                   format=self.settings['old_book_format'],
                                   fn=data.name + "." + self.settings['old_book_format'].lower())
+                worker_db.session.close()
                 return error_message
 
         filename = self._convert_ebook_format()
@@ -71,21 +74,23 @@ class TaskConvert(CalibreTask):
 
     def _convert_ebook_format(self):
         error_message = None
-        local_session = db.CalibreDB().session
+        local_db = db.CalibreDB(expire_on_commit=False)
         file_path = self.file_path
         book_id = self.bookid
         format_old_ext = u'.' + self.settings['old_book_format'].lower()
         format_new_ext = u'.' + self.settings['new_book_format'].lower()
 
-        # check to see if destination format already exists -
+        # check to see if destination format already exists - or if book is in database
         # if it does - mark the conversion task as complete and return a success
         # this will allow send to kindle workflow to continue to work
-        if os.path.isfile(file_path + format_new_ext):
+        if os.path.isfile(file_path + format_new_ext) or\
+            local_db.get_book_format(self.bookid, self.settings['new_book_format']):
             log.info("Book id %d already converted to %s", book_id, format_new_ext)
-            cur_book = calibre_db.get_book(book_id)
+            cur_book = local_db.get_book(book_id)
             self.results['path'] = file_path
             self.results['title'] = cur_book.title
             self._handleSuccess()
+            local_db.session.close()
             return os.path.basename(file_path + format_new_ext)
         else:
             log.info("Book id %d - target format of %s does not exist. Moving forward with convert.",
@@ -105,18 +110,18 @@ class TaskConvert(CalibreTask):
             check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext)
 
         if check == 0:
-            cur_book = calibre_db.get_book(book_id)
+            cur_book = local_db.get_book(book_id)
             if os.path.isfile(file_path + format_new_ext):
-                # self.db_queue.join()
                 new_format = db.Data(name=cur_book.data[0].name,
                                          book_format=self.settings['new_book_format'].upper(),
                                          book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
                 try:
-                    local_session.merge(new_format)
-                    local_session.commit()
+                    local_db.session.merge(new_format)
+                    local_db.session.commit()
                 except SQLAlchemyError as e:
-                    local_session.rollback()
+                    local_db.session.rollback()
                     log.error("Database error: %s", e)
+                    local_db.session.close()
                     return
                 self.results['path'] = cur_book.path
                 self.results['title'] = cur_book.title
@@ -125,6 +130,7 @@ class TaskConvert(CalibreTask):
                 return os.path.basename(file_path + format_new_ext)
             else:
                 error_message = _('%(format)s format not found on disk', format=format_new_ext.upper())
+        local_db.session.close()
         log.info("ebook converter failed with error while converting book")
         if not error_message:
             error_message = _('Ebook converter failed with unknown error')
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index ac3ec424..8424f084 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -167,7 +167,7 @@ class TaskEmail(CalibreTask):
                 smtplib.stderr = org_smtpstderr
 
         except (MemoryError) as e:
-            log.exception(e)
+            log.debug_or_exception(e)
             self._handleError(u'MemoryError sending email: ' + str(e))
             # return None
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
@@ -178,7 +178,7 @@ class TaskEmail(CalibreTask):
             elif hasattr(e, "args"):
                 text = '\n'.join(e.args)
             else:
-                log.exception(e)
+                log.debug_or_exception(e)
                 text = ''
             self._handleError(u'Smtplib Error sending email: ' + text)
             # return None
@@ -225,7 +225,7 @@ class TaskEmail(CalibreTask):
                 data = file_.read()
                 file_.close()
             except IOError as e:
-                log.exception(e)
+                log.debug_or_exception(e)
                 log.error(u'The requested file could not be read. Maybe wrong permissions?')
                 return None
 
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 7887aa4a..4e32db80 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,10 @@
     <div id="books" class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-          <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" />
+            <span class="img">
+              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" />
+              {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+            </span>
         </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 003b33f9..c0fc141e 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -197,7 +197,8 @@
 {% endblock %}
 
 {% block modal %}
-{{ delete_book(book.id) }}
+{{ delete_book() }}
+{{ delete_confirm_modal() }}
 
 <div class="modal fade" id="metaModal" tabindex="-1" role="dialog" aria-labelledby="metaModalLabel">
   <div class="modal-dialog modal-lg" role="document">
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 067ff5e0..ecd840b5 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -61,7 +61,7 @@
     </table>
 {% endblock %}
 {% block modal %}
-{{ delete_book(0) }}
+{{ delete_book() }}
 {% if g.user.role_edit() %}
 <div class="modal fade" id="mergeModal" role="dialog" aria-labelledby="metaMergeLabel">
   <div class="modal-dialog">
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index 4c522132..ba8d4f9e 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -16,12 +16,19 @@
     <div id="collapseOne" class="panel-collapse collapse in">
       <div class="panel-body">
        <label for="config_calibre_dir">{{_('Location of Calibre Database')}}</label>
-       <div class="form-group required input-group">
+       <div class="form-group required{% if filepicker %} input-group{% endif %}">
         <input type="text" class="form-control" id="config_calibre_dir" name="config_calibre_dir" value="{% if config.config_calibre_dir != None %}{{ config.config_calibre_dir }}{% endif %}" autocomplete="off">
+       {% if filepicker %}
         <span class="input-group-btn">
-          <button type="button" id="library_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+          <button type="button" data-toggle="modal" id="calibre_modal_path" data-link="config_calibre_dir" data-filefilter="metadata.db" data-target="#fileModal" id="library_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
         </span>
+       {% endif %}
       </div>
+      {% if not filepicker %}
+       <div class="form-group">
+        <label id="filepicker-hint">{{_('To activate serverside filepicker start Calibre-Web with -f optionn')}}</label>
+      </div>
+      {% endif %}
     {% if feature_support['gdrive']  %}
     <div class="form-group required">
       <input type="checkbox" id="config_use_google_drive" name="config_use_google_drive" data-control="gdrive_settings" {% if config.config_use_google_drive %}checked{% endif %} >
@@ -94,14 +101,14 @@
          <div class="form-group input-group">
           <input type="text" class="form-control" id="config_certfile" name="config_certfile" value="{% if config.config_certfile != None %}{{ config.config_certfile }}{% endif %}" autocomplete="off">
           <span class="input-group-btn">
-            <button type="button" id="certfile_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+            <button type="button" data-toggle="modal" data-link="config_certfile" data-target="#fileModal" id="certfile_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
           </span>
         </div>
           <label for="config_calibre_dir" >{{_('SSL Keyfile location (leave it empty for non-SSL Servers)')}}</label>
          <div class="form-group input-group">
           <input type="text" class="form-control" id="config_keyfile" name="config_keyfile" value="{% if config.config_keyfile != None %}{{ config.config_keyfile }}{% endif %}" autocomplete="off">
           <span class="input-group-btn">
-            <button type="button" id="keyfile_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+            <button type="button" id="keyfile_path" data-toggle="modal" data-link="config_keyfile" data-target="#fileModal" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
           </span>
         </div>
         <div class="form-group">
@@ -268,21 +275,21 @@
           <div class="form-group input-group">
             <input type="text" class="form-control" id="config_ldap_cacert_path" name="config_ldap_cacert_path" value="{% if config.config_ldap_cacert_path != None %}{{ config.config_ldap_cacert_path }}{% endif %}" autocomplete="off">
             <span class="input-group-btn">
-              <button type="button" id="library_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+              <button type="button" id="library_path" data-toggle="modal" data-link="config_ldap_cacert_path" data-target="#fileModal" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
             </span>
           </div>
           <label for="config_ldap_cert_path">{{_('LDAP Certificate Path (Only needed for Client Certificate Authentication)')}}</label>
           <div class="form-group input-group">
             <input type="text" class="form-control" id="config_ldap_cert_path" name="config_ldap_cert_path" value="{% if config.config_ldap_cert_path != None %}{{ config.config_ldap_cert_path }}{% endif %}" autocomplete="off">
             <span class="input-group-btn">
-              <button type="button" id="library_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+              <button type="button" id="library_path" data-toggle="modal" data-link="config_ldap_cert_path" data-target="#fileModal" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
             </span>
           </div>
           <label for="config_ldap_key_path">{{_('LDAP Keyfile Path (Only needed for Client Certificate Authentication)')}}</label>
           <div class="form-group input-group">
             <input type="text" class="form-control" id="config_ldap_key_path" name="config_ldap_key_path" value="{% if config.config_ldap_key_path != None %}{{ config.config_ldap_key_path }}{% endif %}" autocomplete="off">
             <span class="input-group-btn">
-              <button type="button" id="library_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+              <button type="button" id="library_path" data-toggle="modal" data-link="config_ldap_key_path" data-target="#fileModal" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
             </span>
           </div>
         </div>
@@ -384,7 +391,7 @@
            <div class="form-group input-group">
             <input type="text" class="form-control" id="config_converterpath" name="config_converterpath" value="{% if config.config_converterpath != None %}{{ config.config_converterpath }}{% endif %}" autocomplete="off">
             <span class="input-group-btn">
-              <button type="button" id="converter_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+              <button type="button" data-toggle="modal" id="converter_modal_path" data-link="config_converterpath" data-target="#fileModal" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
             </span>
            </div>
            <div class="form-group">
@@ -395,7 +402,7 @@
            <div class="form-group input-group">
             <input type="text" class="form-control" id="config_kepubifypath" name="config_kepubifypath" value="{% if config.config_kepubifypath != None %}{{ config.config_kepubifypath }}{% endif %}" autocomplete="off">
             <span class="input-group-btn">
-              <button type="button" id="kepubify_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+              <button type="button" id="kepubify_path" data-toggle="modal" data-link="config_kepubifypath" data-target="#fileModal" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
             </span>
           </div>
         {% if feature_support['rar'] %}
@@ -403,7 +410,7 @@
            <div class="form-group input-group">
             <input type="text" class="form-control" id="config_rarfile_location" name="config_rarfile_location" value="{% if config.config_rarfile_location != None %}{{ config.config_rarfile_location }}{% endif %}" autocomplete="off">
             <span class="input-group-btn">
-              <button type="button" id="unrar_path" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
+              <button type="button" id="unrar_path" data-toggle="modal" data-link="config_rarfile_location" data-target="#fileModal" class="btn btn-default"><span class="glyphicon glyphicon-folder-open"></span></button>
             </span>
           </div>
         {% endif %}
@@ -412,8 +419,6 @@
   </div>
   {% endif %}
 </div>
-
-
     <div class="col-sm-12">
     {% if not show_login_button %}
     <button type="submit" name="submit" class="btn btn-default">{{_('Save')}}</button>
@@ -428,6 +433,9 @@
   </form>
 </div>
 {% endblock %}
+{% block modal %}
+{{ filechooser_modal() }}
+{% endblock %}
 {% block js %}
 <script type="text/javascript">
     $(document).on('change', '#config_use_google_drive', function() {
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 3c858feb..d57994b4 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -8,7 +8,10 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-            <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+            <span class="img">
+              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+            </span>
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 9025a654..9df0a385 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -89,20 +89,7 @@
 {% endblock %}
 {% block modal %}
 {% if g.allow_registration %}
-<div id="DeleteDomain" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-sm">
-    <!-- Modal content-->
-    <div class="modal-content">
-      <div class="modal-header bg-danger">
-      </div>
-      <div class="modal-body text-center">
-        <p>{{_('Are you sure you want to delete this domain?')}}</p>
-        <button type="button" class="btn btn-danger" id="btndeletedomain" >{{_('Delete')}}</button>
-        <button type="button" class="btn btn-default" id="btncancel" data-dismiss="modal">{{_('Cancel')}}</button>
-      </div>
-    </div>
-  </div>
-</div>
+{{ delete_confirm_modal() }}
 {% endif %}
 {% endblock %}
 {% block js %}
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index ce2c05ac..9724e31d 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -28,8 +28,10 @@
               <div class="col-sm-3 col-lg-2 col-xs-6 book sortable" {% if entry[0].sort %}data-name="{{entry[0].series[0].name}}"{% endif %} data-id="{% if entry[0].series[0].name %}{{entry[0].series[0].name}}{% endif %}">
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
-                          <img src="{{ url_for('web.get_cover', book_id=entry[0].id) }}" alt="{{ entry[0].name }}"/>
-                          <span class="badge">{{entry.count}}</span>
+                          <span class="img">
+                              <img src="{{ url_for('web.get_cover', book_id=entry[0].id) }}" alt="{{ entry[0].name }}"/>
+                              <span class="badge">{{entry.count}}</span>
+                            </span>
                       </a>
                   </div>
                   <div class="meta">
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 1db73c89..d300fc65 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -8,7 +8,10 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              <span class="img">
+                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+              </span>
           </a>
       </div>
       <div class="meta">
@@ -82,7 +85,10 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+            <span class="img">
               <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
+              {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+            </span>
           </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 44d18a1e..643459cd 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,4 +1,4 @@
-{% from 'modal_dialogs.html' import restrict_modal, delete_book %}
+{% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
@@ -189,8 +189,6 @@
       </div>
     </div>
     {% block modal %}{% endblock %}
-
-
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
@@ -200,14 +198,7 @@
     <script src="{{ url_for('static', filename='js/libs/context.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
     <script src="{{ url_for('static', filename='js/libs/jquery.form.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/main.js') }}"></script>
     <script src="{{ url_for('static', filename='js/uploadprogress.js') }}"> </script>
-    {% if g.current_theme == 1 %}
-      <script src="{{ url_for('static', filename='js/libs/jquery.visible.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/libs/compromise.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/libs/readmore.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/caliBlur.js') }}"></script>
-    {% endif %}
     <script type="text/javascript">
         $(function() {
             $("#form-upload").uploadprogress({
@@ -219,6 +210,13 @@
             });
         });
     </script>
+    <script src="{{ url_for('static', filename='js/main.js') }}"></script>
+    {% if g.current_theme == 1 %}
+      <script src="{{ url_for('static', filename='js/libs/jquery.visible.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='js/libs/compromise.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='js/libs/readmore.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='js/caliBlur.js') }}"></script>
+    {% endif %}
     {% block js %}{% endblock %}
   </body>
 </html>
diff --git a/cps/templates/login.html b/cps/templates/login.html
index a031d949..7ae56d1b 100644
--- a/cps/templates/login.html
+++ b/cps/templates/login.html
@@ -22,7 +22,7 @@
     <button type="submit" name="forgot" value="forgot" class="btn btn-default">{{_('Forgot Password?')}}</button>
     {% endif %}
     {% if config.config_remote_login %}
-    <a href="{{url_for('web.remote_login')}}" class="pull-right">{{_('Log in with Magic Link')}}</a>
+    <a href="{{url_for('remotelogin.remote_login')}}" id="remote_login" class="pull-right">{{_('Log in with Magic Link')}}</a>
     {% endif %}
     {% if config.config_login_type == 2 %}
       {% if 1 in oauth_check %}
diff --git a/cps/templates/modal_dialogs.html b/cps/templates/modal_dialogs.html
index 1432960f..da00834c 100644
--- a/cps/templates/modal_dialogs.html
+++ b/cps/templates/modal_dialogs.html
@@ -37,7 +37,7 @@
   </div>
 </div>
 {% endmacro %}
-{% macro delete_book(bookid) %}
+{% macro delete_book() %}
 {% if g.user.role_delete_books() %}
 <div class="modal fade" id="deleteModal" role="dialog" aria-labelledby="metaDeleteLabel">
   <div class="modal-dialog">
@@ -68,3 +68,56 @@
 </div>
 {% endif %}
 {% endmacro %}
+{% macro filechooser_modal() %}
+<div class="modal fade" id="fileModal" role="dialog" aria-labelledby="metafileLabel">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-info text-center">
+          <span>{{_('Choose File Location')}}</span>
+      </div>
+        <div class="modal-body">
+         <table id="file_table" class="table table-striped">
+            <thead>
+              <tr>
+                  <th>{{_('type')}}</th>
+                  <th>{{_('name')}}</th>
+                  <th>{{_('size')}}</th>
+              </tr>
+            </thead>
+            <tbody id="tbody">
+              <tr class="tr-clickable hidden" id="parent" data-type="dir" data-path="..">
+                <td><span class="glyphicon glyphicon-folder-close"></span></td>
+                <td title="{{_('Parent Directory')}}"><span class="parentdir">..</span></td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      <div class="modal-footer">
+        <div class="text-left" id="element_selected"></div>
+        <input type="button" class="btn btn-primary" data-path="" data-link=""  data-folderonly="" data-filefilter="" data-newfile="" value="{{_('Select')}}" name="file_confirm" id="file_confirm" data-dismiss="modal">
+        <button type="button" id="file_abort" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endmacro %}
+
+{% macro delete_confirm_modal() %}
+<div id="GeneralDeleteModal" class="modal fade" role="Dialog">
+  <div class="modal-dialog modal-sm">
+    <div class="modal-content">
+      <div class="modal-header bg-danger text-center">
+      <span id="header"></span>
+      </div>
+      <div class="modal-body text-center">
+        <span id="text"></span>
+          <p></p>
+        <button id="btnConfirmYes" type="button" class="btn btn btn-danger">{{_('Delete')}}</button>
+        <button id="btnConfirmNo" type="button" class="btn btn-default">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endmacro %}
diff --git a/cps/templates/remote_login.html b/cps/templates/remote_login.html
index ce755afd..bfa1b115 100644
--- a/cps/templates/remote_login.html
+++ b/cps/templates/remote_login.html
@@ -4,7 +4,7 @@
   <h2 style="margin-top: 0">{{_('Magic Link - Authorise New Device')}}</h2>
   <p>
     {{_('On another device, login and visit:')}}
-  <h4><a href="{{verify_url}}">{{verify_url}}</a></b>
+  <h4><a id="verify_url" href="{{verify_url}}">{{verify_url}}</a></b>
   </h4>
   <p>
     {{_('Once verified, you will automatically be logged in on this device.')}}
@@ -20,7 +20,7 @@
   (function () {
     // Poll the server to check if the user has authenticated
     var t = setInterval(function () {
-      $.post('{{url_for("web.token_verified")}}', { token: '{{token}}' })
+      $.post('{{url_for("remotelogin.token_verified")}}', { token: '{{token}}' })
         .done(function(response) {
           if (response.status === 'success') {
             // Wait a tick so cookies are updated
diff --git a/cps/templates/search.html b/cps/templates/search.html
index aedb6f45..d11f3ec8 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -43,7 +43,10 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-            <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+            <span class="img">
+                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+            </span>
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index e713fb93..e61fe067 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -31,87 +31,87 @@
           </div>
         </div>
     </div>
-    <label for="include_tag">{{_('Tags')}}</label>
-    <div class="form-group" id="tag">
-      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
-        {% for tag in tags %}
-          <label id="tag_{{tag.id}}" class="btn btn-primary tags_click">
-            <input type="checkbox" autocomplete="off" name="include_tag" id="include_tag" value="{{tag.id}}">{{tag.name}}</input>
-          </label>
-        {% endfor %}
+    <div class="form-group">
+      <label for="read_status">{{_('Read Status')}}</label>
+      <select name="read_status" id="read_status" class="form-control">
+        <option value="" selected></option>
+        <option value="True" >{{_('Yes')}}</option>
+        <option value="False" >{{_('No')}}</option>
+      </select>
+    </div>
+    <div class="row">
+      <div class="form-group col-sm-6" id="tag">
+        <div><label for="include_tag">{{_('Tags')}}</label></div>
+        <select class="selectpicker" name="include_tag" id="include_tag" data-live-search="true" data-style="btn-primary" multiple>
+          {% for tag in tags %}
+            <option class="tags_click" value="{{tag.id}}">{{tag.name}}</option>
+          {% endfor %}
+        </select>
+      </div>
+      <div class="form-group col-sm-6">
+        <div><label for="exclude_tag">{{_('Exclude Tags')}}</label></div>
+        <select class="selectpicker" name="exclude_tag" id="exclude_tag" data-live-search="true" data-style="btn-danger" multiple>
+          {% for tag in tags %}
+            <option  class="tags_click" value="{{tag.id}}">{{tag.name}}</option>
+          {% endfor %}
+        </select>
       </div>
     </div>
-    <label for="exclude_tag">{{_('Exclude Tags')}}</label>
-    <div class="form-group">
-      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
-        {% for tag in tags %}
-          <label id="exclude_tag_{{tag.id}}" class="btn btn-danger tags_click">
-            <input type="checkbox" autocomplete="off" name="exclude_tag" id="exclude_tag" value="{{tag.id}}">{{tag.name}}</input>
-          </label>
-        {% endfor %}
+    <div class="row">
+      <div class="form-group col-sm-6">
+        <div><label for="include_serie">{{_('Series')}}</label></div>
+        <select class="selectpicker" name="include_serie" id="include_serie" data-live-search="true" data-style="btn-primary" multiple>
+          {% for serie in series %}
+            <option value="{{serie.id}}">{{serie.name}}</option>
+          {% endfor %}
+        </select>
       </div>
-    </div>
-    <label for="include_serie">{{_('Series')}}</label>
-    <div class="form-group">
-      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
-        {% for serie in series %}
-          <label id="serie_{{serie.id}}" class="btn btn-primary serie_click">
-            <input type="checkbox" autocomplete="off" name="include_serie" id="include_serie" value="{{serie.id}}">{{serie.name}}</input>
-          </label>
-        {% endfor %}
-      </div>
-    </div>
-    <label for="exclude_serie">{{_('Exclude Series')}}</label>
-    <div class="form-group">
-      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
-        {% for serie in series %}
-          <label id="exclude_serie_{{serie.id}}" class="btn btn-danger serie_click">
-            <input type="checkbox" autocomplete="off" name="exclude_serie" id="exclude_serie" value="{{serie.id}}">{{serie.name}}</input>
-          </label>
-        {% endfor %}
+      <div class="form-group col-sm-6">
+        <div><label for="exclude_serie">{{_('Exclude Series')}}</label></div>
+        <select class="selectpicker" name="exclude_serie" id="exclude_serie" data-live-search="true" data-style="btn-danger" multiple>
+          {% for serie in series %}
+            <option value="{{serie.id}}">{{serie.name}}</option>
+          {% endfor %}
+        </select>
       </div>
     </div>
     {% if languages %}
-      <label for="include_language">{{_('Languages')}}</label>
-      <div class="form-group">
-        <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
+    <div class="row">
+      <div class="form-group col-sm-6">
+        <div><label for="include_language">{{_('Languages')}}</label></div>
+        <select class="selectpicker" name="include_language" id="include_language" data-live-search="true" data-style="btn-primary" multiple>
           {% for language in languages %}
-            <label id="language_{{language.id}}" class="btn btn-primary serie_click">
-              <input type="checkbox" autocomplete="off" name="include_language" id="include_language" value="{{language.id}}">{{language.name}}</input>
-            </label>
+            <option value="{{language.id}}">{{language.name}}</option>
           {% endfor %}
-        </div>
+        </select>
       </div>
-      <label for="exclude_language">{{_('Exclude Languages')}}</label>
-      <div class="form-group">
-        <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
+      <div class="form-group col-sm-6">
+        <div><label for="exclude_language">{{_('Exclude Languages')}}</label></div>
+        <select class="selectpicker" name="exclude_language" id="exclude_language" data-live-search="true" data-style="btn-danger" multiple>
           {% for language in languages %}
-            <label id="exclude_language_{{language.id}}" class="btn btn-danger language_click">
-              <input type="checkbox" autocomplete="off" name="exclude_language" id="exclude_language" value="{{language.id}}">{{language.name}}</input>
-            </label>
+            <option value="{{language.id}}">{{language.name}}</option>
           {% endfor %}
-        </div>
-      </div>
-    {% endif%}
-    <label for="include_extension">{{_('Extensions')}}</label>
-    <div class="form-group" id="extension">
-      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
-        {% for extension in extensions %}
-          <label id="extension_{{extension.format}}" class="btn btn-primary extension_click">
-            <input type="checkbox" autocomplete="off" name="include_extension" id="include_extension" value="{{extension.format}}">{{extension.format}}</input>
-          </label>
-        {% endfor %}
+        </select>
       </div>
     </div>
-    <label for="exclude_extension">{{_('Exclude Extensions')}}</label>
-    <div class="form-group">
-      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
+    {% endif%}
+    <div class="row">
+        <div class="form-group col-sm-6">
+        <div><label for="include_extension">{{_('Extensions')}}</label></div>
+        <select id="include_extension" class="selectpicker" name="include_extension" id="include_extension" data-live-search="true" data-style="btn-primary" multiple>
         {% for extension in extensions %}
-          <label id="exclude_extension_{{extension.format}}" class="btn btn-danger extension_click">
-            <input type="checkbox" autocomplete="off" name="exclude_extension" id="exclude_extension" value="{{extension.format}}">{{extension.format}}</input>
-          </label>
-        {% endfor %}
-      </div>
+            <option value="{{extension.format}}">{{extension.format}}</option>
+          {% endfor %}
+        </select>
+        </div>
+        <div class="form-group col-sm-6">
+        <div><label for="exclude_extension">{{_('Exclude Extensions')}}</label></div>
+        <select id="exclude_extension" class="selectpicker" name="exclude_extension" id="exclude_extension" data-live-search="true" data-style="btn-danger" multiple>
+        {% for extension in extensions %}
+            <option value="{{extension.format}}">{{extension.format}}</option>
+          {% endfor %}
+        </select>
+        </div>
     </div>
     <div class="row">
         <div class="form-group col-sm-6">
@@ -189,10 +189,13 @@
 <script src="{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
-<script>
-</script>
+<script src="{{ url_for('static', filename='js/libs/bootstrap-select.min.js')}}"></script>
+{% if not g.user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-select/defaults-' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
+{% endif %}
 {% endblock %}
 {% block header %}
 <link href="{{ url_for('static', filename='css/libs/typeahead.css') }}" rel="stylesheet" media="screen">
 <link href="{{ url_for('static', filename='css/libs/bootstrap-datepicker3.min.css') }}" rel="stylesheet" media="screen">
+<link href="{{ url_for('static', filename='css/libs/bootstrap-select.min.css') }}" rel="stylesheet" >
 {% endblock %}
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 425e298c..1ad79dbd 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -2,23 +2,38 @@
 {% block body %}
 <div class="discover">
   <h2>{{title}}</h2>
-  {% if g.user.role_download() %}
- <a id="shelf_down" href="{{ url_for('shelf.show_shelf', shelf_type=2, shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Download') }} </a>
+  {% if g.user.role_download() %}
+  <a id="shelf_down" href="{{ url_for('shelf.show_simpleshelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Download') }} </a>
       {% endif %}
   {% if g.user.is_authenticated %}
     {% if (g.user.role_edit_shelfs() and shelf.is_public ) or not shelf.is_public  %}
-      <div id="delete_shelf" data-toggle="modal" data-target="#DeleteShelfDialog" class="btn btn-danger">{{ _('Delete this Shelf') }} </div>
-      <a id="edit_shelf" href="{{ url_for('shelf.edit_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Edit Shelf') }} </a>
-      <a id="order_shelf" href="{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Change order') }} </a>
+      <div class="btn btn-danger" id="delete_shelf" data-value="{{ shelf.id }}">{{ _('Delete this Shelf') }}</div>
+      <a id="edit_shelf" href="{{ url_for('shelf.edit_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Edit Shelf Properties') }} </a>
+      {% if entries.__len__() %}
+      <a id="order_shelf" href="{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Arrange books manually') }} </a>
+      <button id="toggle_order_shelf" type="button" data-alt-text="{{ _('Disable Change order') }}" class="btn btn-primary">{{ _('Enable Change order') }}</button>
+        <div class="filterheader hidden-xs hidden-sm">
+          <a data-toggle="tooltip" title="{{_('Sort according to book date, newest first')}}" id="new" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='new')}}"><span class="glyphicon glyphicon-book"></span> <span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
+          <a data-toggle="tooltip" title="{{_('Sort according to book date, oldest first')}}" id="old" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='old')}}"><span class="glyphicon glyphicon-book"></span> <span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+          <a data-toggle="tooltip" title="{{_('Sort title in alphabetical order')}}" id="asc" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='abc')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
+          <a data-toggle="tooltip" title="{{_('Sort title in reverse alphabetical order')}}" id="desc" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='zyx')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
+          <a data-toggle="tooltip" title="{{_('Sort authors in alphabetical order')}}" id="auth_az" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='authaz')}}"><span class="glyphicon glyphicon-user"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
+          <a data-toggle="tooltip" title="{{_('Sort authors in reverse alphabetical order')}}" id="auth_za" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='authza')}}"><span class="glyphicon glyphicon-user"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
+          <a data-toggle="tooltip" title="{{_('Sort according to publishing date, newest first')}}" id="pub_new" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='pubnew')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
+          <a data-toggle="tooltip" title="{{_('Sort according to publishing date, oldest first')}}" id="pub_old" class="btn btn-primary disabled" href="{{url_for('shelf.show_shelf', shelf_id=shelf.id, sort_param='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+        </div>
+      {% endif %}
     {% endif %}
   {% endif %}
   <div class="row display-flex">
-
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              <span class="img">
+                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+              </span>
             </a>
       </div>
       <div class="meta">
@@ -68,7 +83,7 @@
     {% endfor %}
   </div>
 </div>
-<div id="DeleteShelfDialog" class="modal fade" role="dialog">
+<!--div id="DeleteShelfDialog" class="modal fade" role="dialog">
   <div class="modal-dialog modal-sm">
     <div class="modal-content">
       <div class="modal-header bg-danger text-center">
@@ -82,6 +97,9 @@
       </div>
     </div>
   </div>
-</div>
+</div-->
 
 {% endblock %}
+{% block modal %}
+{{ delete_confirm_modal() }}
+{% endblock %}
diff --git a/cps/templates/shelf_order.html b/cps/templates/shelf_order.html
index 005f663c..1e49f29a 100644
--- a/cps/templates/shelf_order.html
+++ b/cps/templates/shelf_order.html
@@ -5,30 +5,39 @@
     <div>{{_('Drag to Rearrange Order')}}</div>
       <div id="sortTrue" class="list-group">
         {% for entry in entries %}
-          <div id="{{entry['id']}}" class="list-group-item">
+          <div id="{{entry['Books']['id']}}" class="list-group-item">
             <div class="row">
               <div class="col-lg-2 col-sm-4 hidden-xs">
-                  <img class="cover-height" src="{{ url_for('web.get_cover', book_id=entry['id']) }}">
+                {% if entry['visible'] %}
+                  <img class="cover-height" src="{{ url_for('web.get_cover', book_id=entry['Books']['id']) }}">
+                {% else %}
+                  <img class="cover-height" src="{{ url_for('static', filename='generic_cover.jpg') }}">
+                {% endif %}
               </div>
               <div class="col-lg-10 col-sm-8 col-xs-12">
-                  {{entry['title']}}
-                  {% if entry['series']|length > 0 %}
+              {% if entry['visible'] %}
+                  {{entry['Books']['title']}}
+                  {% if entry['Books']['series']|length > 0 %}
                     <br>
-                    {{entry['series_index']}} - {{entry['series'][0].name}}
+                    {{entry['Books']['series_index']}} - {{entry['Books']['series'][0].name}}
                   {% endif %}
                   <br>
-                  {% for author in entry['author'] %}
+                  {% for author in entry['Books']['author'] %}
                     {{author.name.replace('|',',')}}
                     {% if not loop.last %}
                       &amp;
                     {% endif %}
                   {% endfor %}
+              {% else %}
+                  {{_('Hidden Book')}}
+                  <br>
+              {% endif %}
               </div>
             </div>
           </div>
         {% endfor %}
       </div>
-        <button onclick="sendData('{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}')" class="btn btn-default" id="ChangeOrder">{{_('Change order')}}</button>
+        <button onclick="sendData('{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}')" class="btn btn-default" id="ChangeOrder">{{_('Save')}}</button>
         <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" id="shelf_back" class="btn btn-default">{{_('Back')}}</a>
   </div>
 {% endblock %}
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 9ec154be..77251e02 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -55,27 +55,14 @@
       </div>
 
 	  <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
-          {% if g.user.role_download() %}
+          {% if g.user.role_download() %}
             {% if entry.data|length %}
             <div class="btn-group" role="group">
-                {% if entry.data|length < 2 %}
-
-                  {% for format in entry.data %}
-                  <a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}" id="btnGroupDrop1{{format.format|lower}}" class="btn btn-primary" role="button">
-                    <span class="glyphicon glyphicon-download"></span>{{format.format}} ({{ format.uncompressed_size|filesizeformat }})
-                  </a>
-                  {% endfor %}
-                {% else %}
-                  <button id="btnGroupDrop1" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="glyphicon glyphicon-download"></span> {{_('Download')}}
-                    <span class="caret"></span>
-                  </button>
-                  <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
-                  {% for format in entry.data %}
-                    <li><a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}">{{format.format}} ({{ format.uncompressed_size|filesizeformat }})</a></li>
-                  {% endfor %}
-                  </ul>
-                {% endif %}
+                {% for format in entry.data %}
+                <a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}" id="btnGroupDrop{{entry.id}}{{format.format|lower}}" class="btn btn-primary" role="button">
+                  <span class="glyphicon glyphicon-download"></span>{{format.format}} ({{ format.uncompressed_size|filesizeformat }})
+                </a>
+                {% endfor %}
             </div>
             {% endif %}
           {% endif %}
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 9a186eb0..90a32acc 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -63,7 +63,7 @@
     <label>{{ _('Kobo Sync Token')}}</label>
     <div class="form-group col">
       <a class="btn btn-default" id="config_create_kobo_token" data-toggle="modal" data-target="#modal_kobo_token" data-remote="false" href="{{ url_for('kobo_auth.generate_auth_token', user_id=content.id) }}">{{_('Create/View')}}</a>
-      <div class="btn btn-danger" id="config_delete_kobo_token" data-toggle="modal" data-target="#modalDeleteToken" data-remote="false" {% if not content.remote_auth_token.first() %} style="display: none;" {% endif %}>{{_('Delete')}}</div>
+      <div class="btn btn-danger" id="config_delete_kobo_token" data-value="{{ content.id }}" data-remote="false" {% if not content.remote_auth_token.first() %} style="display: none;" {% endif %}>{{_('Delete')}}</div>
     </div>
     {% endif %}
     </div>
@@ -82,8 +82,8 @@
           <label for="Show_detail_random">{{_('Show Random Books in Detail View')}}</label>
       </div>
       {% if ( g.user and g.user.role_admin() and not new_user ) %}
-      <a href="#" id="get_user_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied Tags')}}</a>
-      <a href="#" id="get_user_column_values" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/Denied Custom Column Values')}}</a>
+      <a href="#" id="get_user_tags" class="btn btn-default" data-id="{{content.id}}" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied Tags')}}</a>
+      <a href="#" id="get_user_column_values" data-id="{{content.id}}" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/Denied Custom Column Values')}}</a>
       {% endif %}
     </div>
       <div class="col-sm-6">
@@ -125,19 +125,15 @@
         </div>
       {% endif %}
     {% endif %}
-    {% if g.user and g.user.role_admin() and not profile and not new_user and not content.role_anonymous() %}
-      <div class="checkbox">
-        <label>
-          <input type="checkbox" id="delete" name="delete"> {{_('Delete User')}}
-        </label>
-      </div>
-    {% endif %}
     </div>
       <div class="col-sm-12">
-    <button type="submit" id="submit" class="btn btn-default">{{_('Save')}}</button>
+    <div id="user_submit" class="btn btn-default">{{_('Save')}}</div>
     {% if not profile %}
       <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Cancel')}}</a>
     {% endif %}
+    {% if g.user and g.user.role_admin() and not profile and not new_user and not content.role_anonymous() %}
+      <div class="btn btn-danger" id="btndeluser" data-value="{{ content.id }}" data-remote="false" >{{_('Delete User')}}</div>
+    {% endif %}
     </div>
   </form>
 </div>
@@ -157,23 +153,10 @@
       </div>
     </div>
 
-<div id="modalDeleteToken" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content">
-      <div class="modal-header bg-danger">
-      </div>
-      <div class="modal-body text-center">
-        <p>{{_('Do you really want to delete the Kobo Token?')}}</p>
-        <button type="button" class="btn btn-danger" id="btndeletetoken" value="{{content.id}}">{{_('Delete')}}</button>
-        <button type="button" class="btn btn-default" id="btncancel" data-dismiss="modal">{{_('Back')}}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 {% endblock %}
 {% block modal %}
 {{ restrict_modal() }}
+{{ delete_confirm_modal() }}
 {% endblock %}
 {% block js %}
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index d5031770..d41d4f77 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 94105563..f8021bd3 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+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"
@@ -29,276 +29,313 @@ msgstr "není nainstalováno"
 msgid "Statistics"
 msgstr "Statistika"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Server restartován, znovu načtěte stránku"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Vypínám server, zavřete okno"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Úspěšně obnovené připojení"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Stránka správce"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Opravdu chcete odstranit Kobo token?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Jste si jisti, že chcete odstranit tuto polici?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json není nakonfigurováno pro webové aplikace"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění zápisového souboru není platné. Určete prosím platnou polohu"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění zápisového souboru pro přístup není platné. Určete prosím platnou polohu"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Prosím zadejte LDAP poskytovatele, port, DN a Identifikátor objektu uživatele"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr objektů skupiny LDAP musí mít jeden “%s” formátový identifikátor"
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr uživatelských objektů LDAP musí mít jeden “%s” formátový identifikátor"
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění souboru klíčů není platné, zadejte prosím správnou cestu"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 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:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění databáze není platné, opravte prosím cestu"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "Databáze není zapisovatelná"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Došlo k neznámé chybě."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, 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:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 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:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 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:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Chyba: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "není nakonfigurováno"
@@ -307,98 +344,98 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Formát knihy úspěšně smazán"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "upravit metadata"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s není platným jazykem"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 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:528
+#: cps/editbooks.py:553
 #, 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:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, 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:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, 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:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +444,470 @@ msgstr "Při převodu této knihy došlo k chybě: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive nastavení nebylo dokončeno, zkuste  znovu deaktivovat a aktivovat Google Drive"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s nenalezen na Google Drive: %(fn)s"
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nenalezen: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web zkušební e-mail"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Zkušební e-mail"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Začínáme s Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: 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:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Chyba stahování obalu"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Chyba formátu obalu"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Vytvoření cesty obalu selhalo"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 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:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Pouze jpg/jpeg jsou podporované soubory pro obal"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Chyba provádění UnRar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Čekám"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Spuštěno"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Kobo nastavení"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Přihlášení pomocí GitHub selhalo."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Nepodařilo se načíst informace o uživateli z GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Přihlášení pomocí Google selhalo."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 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:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Připojení k %(oauth)s úspěšné"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Přihlášení selhalo, žádný uživatel s OAuth účtem"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Odpojení od %(oauth)s úspěšné"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Odpojení od %(oauth)s selhalo"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth chyba, prosím opakujte později."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth chyba, prosím opakujte později."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "přihlásit se"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Token nenalezen"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Token vypršel"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Úspěch! Vraťte se prosím do zařízení"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Nedávno přidáné"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Zobrazit nedávné knihy"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Žhavé knihy"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Zobrazit žhavé knihy"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Nejlépe hodnocené knihy"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Zobrazit nejlépe hodnocené knihy"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Přečtené knihy"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Zobrazit prečtené a nepřečtené"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Nepřečtené knihy"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Zobrazit nepřečtené"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Objevte"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Zobrazit náhodné knihy"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Kategorie"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Zobrazit výběr kategorie"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Série"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Zobrazit výběr sérií"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Autoři"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Zobrazit výběr autora"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Vydavatelé"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Zobrazit výběr vydavatele"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Jazyky"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Zobrazit výběr jazyka"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Hodnocení"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Zobrazit výběr hodnocení"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Formáty souborů"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Zobrazit výběr formátů"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Archivované knihy"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Zobrazit archivované knihy"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Zadána neplatná police"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Lituji, nejste oprávněni přidat knihu do police: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Kniha je již součástí police: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Kniha byla přidána do police: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Nejste oprávněni přidat knihu do police: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Knihy jsou již součástí police: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Knihy byly přidány do police: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Nelze přidat knihy do police: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Kniha byla odebrána z police: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Lituji, nejste oprávněni odebrat knihu z této police: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Veřejná police s názvem '%(title)s' již existuje."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Osobní police s názvem ‘%(title)s’ již existuje."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Police %(title)s vytvořena"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Došlo k chybě"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Police %(title)s změněna"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Upravit polici"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Police: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Skrytá kniha"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Nedávno přidáné"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Police: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Zobrazit nedávné knihy"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Žhavé knihy"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Zobrazit žhavé knihy"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Nejlépe hodnocené knihy"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Přečtené knihy"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Nepřečtené knihy"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Zobrazit nepřečtené"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Objevte"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Zobrazit náhodné knihy"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Kategorie"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Zobrazit výběr kategorie"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Série"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Zobrazit výběr sérií"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Autoři"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Zobrazit výběr autora"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Vydavatelé"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Zobrazit výběr vydavatele"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Jazyky"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Zobrazit výběr jazyka"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Hodnocení"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Zobrazit výběr hodnocení"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Formáty souborů"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Zobrazit výběr formátů"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr "Archivované knihy"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Zobrazit archivované knihy"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -888,254 +938,222 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Chyba: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Knihy"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "registrovat"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, 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:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "přihlásit se"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Token nenalezen"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Token vypršel"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Úspěch! Vraťte se prosím do zařízení"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Číst knihu"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre převaděč %(tool)s nenalezen"
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-převaděč selhal: %(error)s"
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, 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
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Převaděč eknih selhal: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1178,7 +1196,6 @@ 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:70
 msgid "Download"
 msgstr "Stahovat"
 
@@ -1191,9 +1208,8 @@ msgid "Edit"
 msgstr "Upravovat"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1233,10 +1249,6 @@ msgstr "SMTP přihlášení"
 msgid "From E-mail"
 msgstr "Z e-mailu"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Upravit základní konfiguraci"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfigurace"
@@ -1245,7 +1257,7 @@ msgstr "Konfigurace"
 msgid "Calibre Database Directory"
 msgstr "Calibre DB adresář"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Úroveň logu"
 
@@ -1285,6 +1297,10 @@ msgstr "Reverzní proxy přihlášení"
 msgid "Reverse proxy header name"
 msgstr "Název záhlaví reverzního prixy"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Upravit základní konfiguraci"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Upravit konfiguraci uživatelského rozhraní"
@@ -1342,16 +1358,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1371,44 +1388,44 @@ msgstr "přes"
 msgid "In Library"
 msgstr "V knihovně"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "redukovat"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Více od"
 
@@ -1444,13 +1461,13 @@ msgstr "Převést knihu"
 msgid "Book Title"
 msgstr "Název knihy"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Popis"
 
@@ -1458,15 +1475,15 @@ msgstr "Popis"
 msgid "Identifiers"
 msgstr "Identifikátory"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "Typy identifikátorů"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "Hodnota identifikátorů"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -1474,7 +1491,7 @@ msgstr "Odstranit"
 msgid "Add Identifier"
 msgstr "Přidat identifikátor"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Štítky"
 
@@ -1498,8 +1515,8 @@ 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:259
-#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Vydavatel"
@@ -1509,11 +1526,13 @@ msgstr "Vydavatel"
 msgid "Language"
 msgstr "Jazyk"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ano"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ne"
 
@@ -1525,47 +1544,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Uložit"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Klíčové slovo"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "Hledat klíčové slovo"
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Zavřít"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Zdroj"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Chyba vyhledávání!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nebyly nalezeny žádné výsledky! Zadejte jiné klíčové slovo."
 
@@ -1670,303 +1690,307 @@ msgstr "Konfigurace knihovny"
 msgid "Location of Calibre Database"
 msgstr "Umístění Calibre databáze"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Použít Google Drive?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Potíže s konfigurací Google Drive"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Ověřit Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Klikněte na odeslat pro pokračování v nastavení"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Po přihlášení dokončete nastavení Google Drive"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre složka"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "ID kanálu sledování metadat"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Odvolat"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Nastavení serveru"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Server port"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Umístění certifikátu SSL (ponechte prázdné pro servery jiné než SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Umístění souboru s klíčem SSL (ponechte prázdné pro servery jiné než SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Aktualizační kanál"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Stabilní"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Noční"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Konfigurace log souboru"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Umístění a jméno log souboru (calibre-web.log pro žádnou položku)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Povolit log přístupů"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Umístění a jméno logu přístupů (access.log pro žádnou položku)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Povolit nahrávání"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Povolené nahrávání formátů souborů"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Povolit anonymní prohlížení"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Povolit veřejnou registraci"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Použít e-mail jako přezdívku"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Povolit Magic Link vzdálené přihlášení"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Povolit Kobo synchronizaci"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Proxy neznámé požadavky na obchod Kobo"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Použít Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Získat API klíč"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API Klíč"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API tajemství"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Povolit reverzní ověření proxy"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Název záhlaví reverzního proxy"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Typ přihlášení"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Použít standartní ověření"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Použít ověření LDAP"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Použít OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Název hostitele serveru LDAP nebo IP adresa"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "LDAP Server Port"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "LDAP Šifrování"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Žádné"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP Ověření"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonymní"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Neověřeno"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Jednoduché"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Uživatelské jméno správce LDAP"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Heslo správce LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Rozlišující název LDAP (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Filtr objektu uživatele LDAP"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Server LDAP je OpenLDAP?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "Následující nastavení jsou potřeba pro import uživatele"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtr objektů skupiny LDAP"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Jméno skupiny LDAP"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Pole členů skupiny LDAP"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Získat %(provider)s OAuth pověření"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Klient Id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Klient Tajemství"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externí binární soubory"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Cesta k převaděči e-knih Calibre"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Nastavení převaděče e-knih Calibre"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Cesta k převaděči e-knih Kepubify"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Umístění Unrar binarních souborů"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Přihlásit"
@@ -2165,10 +2189,6 @@ msgstr "Zadejte jméno domény"
 msgid "Denied Domains (Blacklist)"
 msgstr "Zakázané domény pro registraci"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Další"
@@ -2189,19 +2209,21 @@ msgstr "Vytvořit problém"
 msgid "Return to Home"
 msgstr "Zpět domů"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2273,8 +2295,7 @@ msgstr "Knihy organizované v policích"
 msgid "Home"
 msgstr "Domů"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Zpět"
 
@@ -2303,7 +2324,7 @@ msgstr "Odhlásit se"
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Nahrávání..."
 
@@ -2327,11 +2348,11 @@ msgstr "Předchozí"
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Chyba"
 
@@ -2415,6 +2436,30 @@ msgstr "Důležitá Kobo poznámka: smazané knihy zůstanou na jakémkoli spár
 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/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web katalog eknih"
@@ -2575,23 +2620,27 @@ msgstr "Datum vydání od"
 msgid "Published Date To"
 msgstr "Datum vydání do"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Vynechat štítky"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Vynechat série"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Vynechat jazyky"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Přípony"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Vynechat přípony"
 
@@ -2608,18 +2657,22 @@ msgid "Delete this Shelf"
 msgstr "Smazat tuto polici"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Upravit polici"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Změnit řazení"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Police bude smazána pro všechny uživatele"
 
@@ -2631,6 +2684,10 @@ msgstr "Sdílet se všemi"
 msgid "Drag to Rearrange Order"
 msgstr "Přetažením uspořádáte pořadí"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Skrytá kniha"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Statistika knihovny"
@@ -2731,15 +2788,11 @@ msgstr "Vytvořit/Prohlížet"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Přidat povolené/zakázané hodnoty vlastních sloupců"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Odstranit tohoto uživatele"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Vygenerovat URL pro Kobo Auth"
 
-#: 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 cd6a69c0..7591fd75 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 36fc797a..5206a3f9 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-12-01 14:10+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -30,276 +30,313 @@ msgstr "Nicht installiert"
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet, Seite bitte neu laden"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Erfolgreich neu verbunden"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Möchten Sie wirklich den Kobo Token löschen?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Wirklich das Bücherregal löschen?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json ist nicht für Web Anwendungen konfiguriert"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Logdatei Pfad ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zugriffs Logdatei Pfad ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Bitte einen LDAP Server, Port, DN und Benutzer Objekt angeben"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gruppen Objekt Filter benötigt genau eine \"%s\" Format Kennung"
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Benutzer Objekt Filter benötigt genau eine \"%s\" Format Kennung"
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Schlüsseldatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DB Pfad ist nicht gültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "Datenbank ist nicht schreibbar"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Benutzer kann nicht gelöscht werden, es wäre kein Admin Benutzer übrig"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Fehler: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "Nicht konfiguriert"
@@ -308,98 +345,98 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Buch Format erfolgreich gelöscht"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ist keine gültige Sprache"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, 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:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +445,470 @@ msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive Setup is nicht komplett, bitte versuche Google Drive zu deaktivieren und aktiviere es anschließend erneut"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nicht gefunden: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web Test-E-Mail"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Test-E-Mail"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-Mail: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: 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:338
+#: 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:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Fehler beim Herunterladen des Covers"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Coverdatei fehlerhaft"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Fehler beim Erzeugen des Ordners für die Coverdatei"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 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:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg Dateien als Cover untertützt"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Kobo Setup"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Login mit Github fehlgeschlagen."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Laden der Benutzerinformationen von Github fehlgeschlagen."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Login mit Google fehlgeschlagen."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr "Laden der Benutzerinformationen von Google fehlgeschlagen."
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Verbindung mit %(oauth)s erfolgreich"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Login fehlgeschlagen, es ist kein Benutzer mit diesem Account verbunden"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Verbindung zu %(oauth)s erfolgreich getrennt"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Verbindung mit %(oauth)s fehlgeschlagen"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "Nicht mit  %(oauth)s verbunden"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth Fehler, bitte später erneut versuchen."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth Fehler, bitte später erneut versuchen."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "Login"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Token wurde nicht gefunden"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Token ist abgelaufen"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Erfolg! Bitte zum Gerät zurückkehren"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Kürzlich hinzugefügt"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Zeige kürzlich hinzugefügte Bücher"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Beliebte Bücher"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Zeige beliebte Bücher"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr "Heruntergeladene Bücher"
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr "Zeige heruntergeladene Bücher"
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Best bewertete Bücher"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Bestbewertete Bücher anzeigen"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Gelesene Bücher"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Zeige gelesene/ungelesene Bücher"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Ungelesene Bücher"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Zeige Ungelesene"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Entdecke"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Zeige zufällige Bücher"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Kategorien"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Zeige Kategorienauswahl"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Serien"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Zeige Serienauswahl"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Autoren"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Zeige Autorenauswahl"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Verleger"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Zeige Verlegerauswahl"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Sprachen"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Zeige Sprachauswahl"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Bewertungen"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Zeige Bewertungsauswahl"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Dateiformate"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Zeige Dateiformatauswahl"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Archivierte Bücher"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Zeige archivierte Bücher"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr "Bücherliste"
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr "Zeiche Bücherliste"
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Ungültiges Bücherregal angegeben"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Du hast keine Berechtigung, ein Buch zu diesem Bücherregal hinzuzufügen: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Buch ist bereits Teil des Bücherregals %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Das Buch wurde dem Bücherregal %(sname)s hinzugefügt"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Dir ist es nicht erlaubt, ein Buch zum Bücherregal %(name)s  hinzuzufügen"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Bücher sind bereits Teil des Bücherregals %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Bücher wurden zum Bücherregal %(sname)s hinzugefügt"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Bücher konnten nicht zum Bücherregal %(sname)s hinzugefügt werden"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Dir ist es nicht erlaubt, Bücher aus dem Bücherregal %(sname)s zu entfernen"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereit ein öffentliches Bücherregal mit dem Name '%(title)s'."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereit ein privates Bücherregal mit dem Name '%(title)s'."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Bücherregal: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Fehler beim Öffnen des Bücherregals. Bücherregal exisitert nicht oder ist nicht zugänglich"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Verstecktes Buch"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Kürzlich hinzugefügt"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Bücherregal: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Zeige kürzlich hinzugefügte Bücher"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Beliebte Bücher"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Zeige beliebte Bücher"
-
-#: cps/ub.py:74
-msgid "Downloaded Books"
-msgstr "Heruntergeladene Bücher"
-
-#: cps/ub.py:76
-msgid "Show Downloaded Books"
-msgstr "Zeige heruntergeladene Bücher"
-
-#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:683
-msgid "Top Rated Books"
-msgstr "Best bewertete Bücher"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Gelesene Bücher"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Ungelesene Bücher"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Zeige Ungelesene"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Entdecke"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Zeige zufällige Bücher"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Kategorien"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Zeige Kategorienauswahl"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Serien"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Zeige Serienauswahl"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Autoren"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Zeige Autorenauswahl"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Verleger"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Zeige Verlegerauswahl"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Sprachen"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Zeige Sprachauswahl"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Bewertungen"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Zeige Bewertungsauswahl"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Dateiformate"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Zeige Dateiformatauswahl"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr "Archivierte Bücher"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Zeige archivierte Bücher"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr "Bücherliste"
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr "Zeiche Bücherliste"
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Fehler beim Öffnen des Bücherregals. Bücherregal exisitert nicht oder ist nicht zugänglich"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -889,254 +939,222 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Fehler: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Bücher"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, 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/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Suche"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 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:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, 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:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "Login"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Token wurde nicht gefunden"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Token ist abgelaufen"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Erfolg! Bitte zum Gerät zurückkehren"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre E-Book Konverter %(tool)s nicht gefunden"
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify Konverter Aufruf fehlgeschlagen: %(error)s"
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, 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
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Fehler des EBook-Converters: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1179,7 +1197,6 @@ 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:70
 msgid "Download"
 msgstr "Download"
 
@@ -1192,9 +1209,8 @@ msgid "Edit"
 msgstr "Editieren"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1234,10 +1250,6 @@ msgstr "SMTP-Login"
 msgid "From E-mail"
 msgstr "Absenderadresse"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Basiskonfiguration"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -1246,7 +1258,7 @@ msgstr "Konfiguration"
 msgid "Calibre Database Directory"
 msgstr "Ordner der Calibre-DB"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Loglevel"
 
@@ -1286,6 +1298,10 @@ msgstr "Reverse Proxy Login"
 msgid "Reverse proxy header name"
 msgstr "Reverse Proxy Header Name"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Basiskonfiguration"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
@@ -1343,16 +1359,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Abbruch"
 
@@ -1372,44 +1389,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Bibliothek"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "Reduzieren"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Mehr von"
 
@@ -1445,13 +1462,13 @@ msgstr "Konvertiere Buch"
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1459,15 +1476,15 @@ msgstr "Beschreibung"
 msgid "Identifiers"
 msgstr "IDs"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "ID Typ"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "ID Wert"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1475,7 +1492,7 @@ msgstr "Entfernen"
 msgid "Add Identifier"
 msgstr "ID hinzufügen"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Tags"
 
@@ -1499,8 +1516,8 @@ msgstr "Coverdatei von Lokalem Laufwerk hochladen"
 msgid "Published Date"
 msgstr "Herausgabedatum"
 
-#: 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Herausgeber"
@@ -1510,11 +1527,13 @@ msgstr "Herausgeber"
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nein"
 
@@ -1526,47 +1545,48 @@ msgstr "Format hochladen"
 msgid "View Book on Save"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Speichern"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Suchbegriff "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Lade..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Schließen"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Quelle"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Fehler bei der Suche!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Keine Ergebnisse gefunden! Bitte ein anderes Schlüsselwort benutzen."
 
@@ -1671,303 +1691,307 @@ msgstr "Bibliothekskonfiguration"
 msgid "Location of Calibre Database"
 msgstr "Speicherort der Calibre-Datenbank"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Google Drive benutzen?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive Konfigurationsproblem"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Google Drive authentifizieren"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Bitte auf Abschicken drücken, um mit dem Setup fortzufahren"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Bitte Google Drive Konfiguration nach Login beenden"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre-Ordner"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Matadata Überwachungs-ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Widerrufen"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Server Port"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Speicherort der SSL-Certdatei (leerlassen, falls kein SSL-Server)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Speicherort der SSL-Keydatei (leerlassen, falls kein SSL-Server)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Update Kanal"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Stabil"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Nightly"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Konfiguration der Logdatei"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Position und Name der Logdatei (calibre-web.log bei keiner Eingabe)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Zugriffs-Logdatei aktivieren"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Position und Name der Zugriffs-Logdatei (access.log bei keiner Eingabe)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Feature-Konfiguration"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Hochladen aktivieren"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Erlaubte Dateiformate zum Hochladen"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Anonymes Durchsuchen aktivieren"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Öffentliche Registrierung aktivieren"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Benutze E-Mail als Benutzername"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Remotelogin ('Magischer Link') aktivieren"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Synchronisation mit Kobo aktivieren"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Unbekannte Anfragen an Kobo.com weiterleiten"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr "Externer Server Port (für Port Weiterleitung von API Aufrufen)"
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Benutze Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Einen API Schlüssel erhalten"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Öffentlicher Goodreads API Schlüssel"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Geheimer Goodreads API Schlüssel"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Reverse Proxy Authentifizierung zulassen"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Reverse Proxy Header Name"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Logintyp"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Benutze Standard Authentifizierung"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Benutze LDAP-Login"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Benutze OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP-Server Hostname oder IP-Adresse"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "LDAP Server Port"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "LDAP Verschlüsselung"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Keine"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP Authentifizierung"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Unauthentifiziert"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Einfach"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP Administrator Benutzername"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP Administrator Passwort"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Ist der LDAP-Server ein OpenLDAP-Server?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "Die nachfolgenden Einstellungen werden nur für den Benutzerimport benötigt"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "LDAP Gruppen Objekt Filter"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP Gruppen Name"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP Gruppen Mitglieds Feld"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Erhalte %(provider)s OAuth Berechtigungen"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externe Programme"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Pfad zum Calibre E-Book Konverter"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Calibre E-Book Konverter Einstellungen"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Pfad zum Kepubify E-Book Konverter"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Pfad zur UnRar-Binärdatei"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Login"
@@ -2166,10 +2190,6 @@ msgstr "Domainnamen eingeben"
 msgid "Denied Domains (Blacklist)"
 msgstr "Verbotene Domains für eine Registrierung"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Nächste"
@@ -2190,19 +2210,21 @@ msgstr "Issue erzeugen"
 msgid "Return to Home"
 msgstr "Zurück zur Hauptseite"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2274,8 +2296,7 @@ msgstr "Bücher in Bücherregalen organisiert"
 msgid "Home"
 msgstr "Home"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Zurück"
 
@@ -2304,7 +2325,7 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Lade hoch..."
 
@@ -2328,11 +2349,11 @@ msgstr "Vorheriger Eintrag"
 msgid "Book Details"
 msgstr "Buchdetails"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Fehler"
 
@@ -2416,6 +2437,30 @@ msgstr "Wichtiger Kobo Hinweis: Gelöschte Bücher bleiben auf auf allen verbund
 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/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web E-Book-Katalog"
@@ -2576,23 +2621,27 @@ msgstr "Herausgabedatum von"
 msgid "Published Date To"
 msgstr "Herausgabedatum bis"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Tags ausschließen"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Serien ausschließen"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Sprachen ausschließen"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Erweiterungen ausschließen"
 
@@ -2609,18 +2658,22 @@ msgid "Delete this Shelf"
 msgstr "Lösche dieses Bücherregal"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Bücherregal editieren"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Reihenfolge ändern"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Das Bücherregal wird für alle und für immer gelöscht"
 
@@ -2632,6 +2685,10 @@ msgstr "Bücherregal mit anderen Benutzern teilen"
 msgid "Drag to Rearrange Order"
 msgstr "Drag 'n drop um Reihenfolge zu ändern"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Verstecktes Buch"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Bibiliotheksstatistiken"
@@ -2732,15 +2789,11 @@ msgstr "Erzeugen/Ansehen"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten hinzufügen"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Kobo Auth URL erzeugen"
 
-#: 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
index 213abc39..4f0422a0 100644
Binary files a/cps/translations/el/LC_MESSAGES/messages.mo 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
index cbdd7456..72f23f15 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -29,276 +29,313 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "Statistics"
 msgstr "Στατιστικά"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Ο διακομιστής επανεκκίνησε, παρακαλούμε φόρτωσε ξανά τη σελίδα"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Πραγματοποιείται κλείσιμο του διακομιστή, παρακαλούμε κλείσε το παράθυρο"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Επιτυχής επανασύνδεση"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Άγνωστη εντολή"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Σελίδα διαχειριστή"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "UI Διαμόρφωση"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Θέλεις πραγματικά να διαγράψεις τη Μονάδα Kobo;"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Απόρριψη"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "Η DB δεν μπορεί να Γραφτεί"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Βασική Διαμόρφωση"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Προσθήκη νέου χρήστη"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Το e-mail δοκιμής στάλθηκε επιτυχώς στο %(kindlemail)s"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Σφάλμα: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "δεν διαμορφώθηκε"
@@ -307,98 +344,98 @@ msgstr "δεν διαμορφώθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Σφάλμα ανοίγματος eBook. Το αρχείο δεν υπάρχει ή το αρχείο δεν είναι προσβάσιμο"
 
-#: cps/editbooks.py:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "επεξεργασία μεταδεδομένων"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
 
-#: cps/editbooks.py:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "Σφάλμα επεξεργασίας βιβλίου, παρακαλούμε έλεγξε το φύλλο καταγραφής για λεπτομέρειες"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Το αρχείο %(file)s ανέβηκε"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
@@ -407,457 +444,470 @@ msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού τ
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, προσπάθησε να απενεργοποιήσεις και να ενεργοποιήσεις ξανά το Google Drive"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Η ανάκληση ονόματος δεν έχει επαληθευτεί, παρακαλούμε ακολούθησε τα βήματα για την επαλήθευση ονόματος στην κονσόλα προγραμματιστή google"
 
-#: cps/helper.py:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε στο Google Drive: %(fn)s"
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web δοκιμαστικό e-mail"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Δοκιμαστικό e-mail"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Ξεκινήστε με το Calibre-Web"
 
-#: cps/helper.py:136
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "e-mail εγγραφής για χρήστη: %(name)s"
 
-#: cps/helper.py:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:235
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Το αρχείου που χητήθηκε δεν μπορεί να διαβαστεί. Μπορεί να υπάρχουν λαθασμένες άδειες;"
 
-#: cps/helper.py:332
+#: 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:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Η διαγραφή βιβλίου %(id)s απέτυχε: %(message)s"
 
-#: cps/helper.py:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Σφάλμα Κατεβάσματος Φόντου"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Σφάλμα Μορφής Φόντου"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Αποτυχία δημιουργίας πορείας για φόντο"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Το αρχείο φόντου δεν είναι ένα έγκυρο αρχείο εικόνας, ή δεν μπόρεσε να αποθηκευτεί"
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
-msgstr "Μόνο jpg/jpeg/png/webp αρχεία υποστηρίζονται ως αρχεία φόντου"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Μόνο jpg/jpeg αρχεία υποστηρίζονται ως αρχεία φόντου"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Σφάλμα εκτέλεσης UnRar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Αναμονή"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Ξεκίνησε"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Τελείωσε"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "ʼΑγνωστη κατάσταση"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Καθορισμός Kobo"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Αποτυχία σύνδεσης με GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Αποτυχία σύνδεσης με το Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Η Σύνδεση στο %(oauth)s Πέτυχε"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Η σύνδεση απέτυχε, Δεν Υπάρχει Συνδεδεμένος Χρήστης Με Λογαριασμό OAuth"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Πέτυχε"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Απέτυχε"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "Δεν Είναι Συνδεδεμένο με το %(oauth)s"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "σύνδεση"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Η μάρκα δεν βρέθηκε"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Η μάρκα έχει λήξει"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Προστέθηκε Πρόσφατα"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Προβολή πρόσφατων βιβλίων"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Βιβλία στη Μόδα"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Προβολή Βιβλίων στη Μόδα"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr "Κατεβασμένα Βιβλία"
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr "Προβολή Κατεβασμένων Βιβλίων"
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Βιβλία που Διαβάστηκαν"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Προβολή διαβασμένων και αδιάβαστων"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Βιβλία που δεν Διαβάστηκαν"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Προβολή αδιάβαστων"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Ανακάλυψε"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Προβολή τυχαίων βιβλίων"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Προβολή επιλογών κατηγορίας"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Σειρές"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Προβολή επιλογών σειράς"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Συγγραφείς"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Προβολή επιλογών συγγραφέα"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Εκδότες"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Προβολή επιλογών εκδότη"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Γλώσσες"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Προβολή επιλογών γλώσσας"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Αξιολογήσεις"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Προβολή επιλογών αξιολόγησης"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Μορφές αρχείου"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Προβολή επιλογών μορφής αρχείου"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Αρχειοθετημένα Βιβλία"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Προβολή αρχειοθετημένων βιβλίων"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr "Λίστα Βιβλίων"
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr "Προβολή Λίστας Βιβλίων"
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Διευκρινίστηκε μη έγκυρο ράφι"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, 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
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Το βιβλίο είναι ήδη μέρος αυτού του ραφιού: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Το βιβλίο έχει προστεθεί στο ράφι: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Δεν σου επιτρέπεται να προσθέσεις ένα βιβλίο στο ράφι: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Τα βιβλία είναι ήδη μέρος του ραφιού: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Βιβλία είχαν προστεθεί στο ραφι: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Δεν μπόρεσε να γίνει η προσθήκη βιβλίων στο ράφι: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, 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
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Το ράφι %(title)s δημιουργήθηκε"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Υπήρξε ένα σφάλμα"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Δημιούργησε ένα Ράφι"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Το ράφι %(title)s άλλαξε"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 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
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Προστέθηκε Πρόσφατα"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Ράφι: '%(name)s"
 
-#: 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:683
-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:944
-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:947
-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:1248
-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:1152 cps/web.py:1162
-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:1131
-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:1227
-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:971
-msgid "Archived Books"
-msgstr "Αρχειοθετημένα Βιβλία"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Προβολή αρχειοθετημένων βιβλίων"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr "Λίστα Βιβλίων"
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr "Προβολή Λίστας Βιβλίων"
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -888,254 +938,222 @@ msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία σταθερή έκδοση."
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Σφάλμα: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Βιβλία"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Κατεβασμένα βιβλία από %(user)s"
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Συγγραφέας: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Εκδότης: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, 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:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "εγγραφή"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr "Αυτό το όνομα χρήστη ή η διεύθυνση e-mail είναι ήδη σε χρήση."
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "σύνδεση"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Η μάρκα δεν βρέθηκε"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Η μάρκα έχει λήξει"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Διάβασε ένα Βιβλίο"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Το εργαλείο μετατροπής Calibre ebook %(tool)s δεν βρέθηκε"
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s μορφή δεν βρέθηκε σε δίσκο"
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr "Ο μετατροπέας Ebook απέτυχε με άγνωστο σφάλμα"
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Kepubify απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υπάρχουν περισσότερα από ένα αρχεία στο φάκελο %(folder)s"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
@@ -1178,7 +1196,6 @@ 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 "Κατέβασμα"
 
@@ -1191,9 +1208,8 @@ 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -1233,10 +1249,6 @@ msgstr "Σύνδεση SMTP"
 msgid "From E-mail"
 msgstr "Από E-mail"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Επεξεργασία Βασικής Διαμόρφωσης"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Διαμόρφωση"
@@ -1245,7 +1257,7 @@ msgstr "Διαμόρφωση"
 msgid "Calibre Database Directory"
 msgstr "Ευρετήριο Βάσης Δεδομένων Calibre"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Επίπεδο Φύλλου Καταγραφής"
 
@@ -1285,6 +1297,10 @@ msgstr "Αναστροφή Σύνδεσης Διακομιστή Μεσολάβ
 msgid "Reverse proxy header name"
 msgstr "Όνομα επικεφαλίδας αναστροφής διακομιστή μεσολάβησης"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Επεξεργασία Βασικής Διαμόρφωσης"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Επεξεργασία Διαμόρφωσης UI"
@@ -1342,16 +1358,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις επανεκκίνηση"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -1371,44 +1388,44 @@ msgstr "μέσω"
 msgid "In Library"
 msgstr "Στη Βιβλιοθήκη"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "μείωση"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Περισσότερα από"
 
@@ -1444,13 +1461,13 @@ msgstr "Μετατροπή βιβλίου"
 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
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 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
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -1458,15 +1475,15 @@ msgstr "Περιγραφή"
 msgid "Identifiers"
 msgstr "Αναγνωριστικά"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "Είδος Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "Τιμή Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Αφαίρεση"
 
@@ -1474,7 +1491,7 @@ msgstr "Αφαίρεση"
 msgid "Add Identifier"
 msgstr "Προσθήκη Αναγνωριστικού"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Ετικέτες"
 
@@ -1498,8 +1515,8 @@ msgstr "Ανέβασμα Εξώφυλλου από Τοπικό Δίσκο"
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Εκδότης"
@@ -1509,11 +1526,13 @@ msgstr "Εκδότης"
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ναι"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Όχι"
 
@@ -1525,47 +1544,48 @@ msgstr "Μορφή Ανεβάσματος"
 msgid "View Book on Save"
 msgstr "Προβολή Βιβλίου σε Αποθήκευση"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Συγκέντρωση Μεταδεδομένων"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Λέξη κλειδί"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "Αναζήτηση λέξης κλειδιού"
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Κάνε κλικ στο εξώφυλλο για φόρτωση μεταδεδομένων στη φόρμα"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Πηγή"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Σφάλμα αναζήτησης!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Δεν βρέθηκε(αν) αποτέλεσμα(τα)! Παρακαλούμε δοκίμασε μια άλλη λέξη κλειδί."
 
@@ -1670,303 +1690,307 @@ msgstr "Διαμόρφωση Βιβλιοθήκης"
 msgid "Location of Calibre Database"
 msgstr "Τοποθεσία Βάσης Δεδομένων Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Χρήση Google Drive;"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive πρόβλημα διαμόρφωσης"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Πιστοποίηση αυθεντικότητας Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Παρακαλούμε επέλεξε αποθήκευση για να συνεχίσεις με τον καθορισμό"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Παρακαλούμε ολοκλήρωσε τον καθορισμό του Google Drive μετά τη σύνδεση"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Αρχείο Google Drive Calibre"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Ταυτότητα Καναλιού Προβολής Μεταδεδομένων"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Αναίρεση"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Διαμόρφωση Διακομιστή"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Θύρα Διακομιστή"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Τοποθεσία πιστοποιητικού SSL (αφήστε το κενό για Διακομιστές που δεν είναι SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Τοποθεσία αρχείου κλειδιού SSL (αφήστε το κενό για Διακομιστές που δεν είναι SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Ενημέρωση Καναλιού"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Σταθερό"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Νυχτερινό"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Διαμόρφωση αρχείου καταγραφής"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Τοποθεσία και όνομα αρχείου φύλλου καταγραφής (calibre-web.log για καμία καταχώρηση)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Ενεργοποίηση Πρόσβασης Φύλλου Καταγραφής"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Τοποθεσία και όνομα πρόσβασης αρχείου φύλλου καταγραφής (access.log για καμία καταχώρηση)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Ενεργοποίηση Ανεβάσματος"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Επιτρεπόμενες Μορφές Αρχείων για Ανέβασμα"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Ενεργοποίηση Ανώνυμης Περιήγησης"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Ενεργοποίηση Δημόσιας Εγγραφής"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Χρήση E-Mail ως Όνομα Χρήστη"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Ενεργοποίηση Μαγικού Συνδέσμου Απομακρυσμένης Σύνδεσης"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Ενεργοποίηση συγχρονισμού Kobo"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Proxy άγνωστα αιτήματα στο Κατάστημα Kobo"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr "Εξωτερική Θύρα Διακομιστή (για κλήσεις API προωθημένες στη θύρα)"
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Χρήση Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Δημιουργία ενός Κλειδιού API"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads Κλειδί API"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads Μυστικό API"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Να Επιτραπεί η Αναστροφή Επαλήθευσης Proxy"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Αναστροφή Proxy Όνομα Επικεφαλίδας"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Είδος σύνδεσης"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Χρήση Στεθερής Επαλήθευσης"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Χρήση Επαλήθευσης LDAP"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Χρήση OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Όνομα Διακομιστή Φιλοξενίας LDAP ή Διεύθυνση IP"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "Θύρα Διακομιστή LDAP"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "LDAP Αποκρυπτογράφηση"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Κανένα"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP Επαλήθευση"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Ανώνυμοι"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Μη επαληθεύσιμο"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Απλό"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP Όνομα Χρήστη Διαχειριστή"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP Κωδικός Διαχειριστή"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Χαρακτηριστικό Όνομα (ΧΟ)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP Αντικείμενο Φίλτρου Χρήστη"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Είναι ο Διακομιστής LDAP OpenLDAP;"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "Χρειάζονται οι Ακόλουθες Ρυθμίσεις για Εισαγωγη Χρήστη"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Αντικείμενο Φίλτρου Ομάδας LDAP"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP Όνομα Ομάδας"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP Πεδίο Μελών Ομάδας"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Απόκτηση %(provider)s OAuth Διαπιστευτήρια"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Ταυτότητα Πελάτη"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Μυστικό Πελάτη"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Εξωτερικοί Δυαδικοί"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Πορεία για το Μετατροπέα Calibre E-Book"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Calibre E-Book Ρυθμίσεις Μετατροπέα"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Πορεία για Μετατροπέα Kepubify E-Book"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Τοποθεσία δυαδικού Unrar"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Σύνδεση"
@@ -2165,10 +2189,6 @@ msgstr "Όνομα domain"
 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 "Επόμενο"
@@ -2189,19 +2209,21 @@ msgstr "Δημιουργία Θέματος"
 msgid "Return to Home"
 msgstr "Επιστροφή στην Κεντρική"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2273,8 +2295,7 @@ msgstr "Βιβλία οργανωμένα σε ράφια"
 msgid "Home"
 msgstr "Κεντρική"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Πίσω"
 
@@ -2303,7 +2324,7 @@ msgstr "Αποσύνδεση"
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Φόρτωση..."
 
@@ -2327,11 +2348,11 @@ msgstr "Προηγούμενο"
 msgid "Book Details"
 msgstr "Λεπτομέρειες Βιβλίου"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -2415,6 +2436,30 @@ msgstr "Σημαντική Σημείωση Kobo: τα διαγραμμένα β
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr "Τα βιβλία πρέπει πρώτα να αρχειοθετηθούν και να συγχρονιστεί η συσκευή πριν μπορέσει να διαγραφεί με ασφάλεια το βιβλίο."
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web Κατάλογος eBook"
@@ -2575,23 +2620,27 @@ msgstr "Ημερομηνία Έκδοσης Από"
 msgid "Published Date To"
 msgstr "Ημερομηνία Έκδοσης Μέχρι"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Εξαίρεση Ετικετών"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Εξαίρεση Σειρών"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Εξαίρεση Γλωσσών"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Επεκτάσεις"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Εξαίρεση Επεκτάσεων"
 
@@ -2608,18 +2657,22 @@ msgid "Delete this Shelf"
 msgstr "Διαγραφή αυτού του Ραφιού"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Επεξεργασία Ραφιού"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Αλλαγή σειράς"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: cps/templates/shelf.html:75
-msgid "Are you sure you want to delete this shelf?"
-msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Το ράφι θα διαγραφεί για όλους τουε χρήστες"
 
@@ -2631,6 +2684,10 @@ msgstr "Κοινοποίηση με Όλους"
 msgid "Drag to Rearrange Order"
 msgstr "Σύρε για Αναδιάταξη Σειράς"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Κρυμμένο Βιβλίο"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Στατιστικά Βιβλιοθήκης"
@@ -2731,15 +2788,11 @@ msgstr "Δημιουγία/Προβολή"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Προσθήκη Τιμών Ειδικά Προσαρμοσμένης Στήλης επιτρέπεται/Απορρίπτεται"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Διαγραφή Χρήστη"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 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 162088b5..aeaf6361 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 c7bcc1a8..f09008a4 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -33,276 +33,313 @@ msgstr "no instalado"
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "El servidor se está apagando. Por favor, cierre la ventana"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Reconexión correcta"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz de usuario"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "¿Realmente quieres borrar el Token de Kobo?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "¿Realmente quiere eliminar este estante?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json no está configurado para la aplicación web"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Logfile no es válida. Por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Access Logfile no es válida. Por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, introduzca un proveedor LDAP, puerto, DN y el User Object Identifier"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Keyfile no es válida, por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 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:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de la base de datos no es válida. Por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "La base de datos no es modificable"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, completa todos los campos!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 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:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 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:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Ocurrió un error desconocido."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, 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:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 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:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 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:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 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:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 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)"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Error: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Error al crear al menos un usuario LDAP"
+
+#: cps/admin.py:1424
+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/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "no configurado"
@@ -311,98 +348,98 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Formato de libro borrado correctamente"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Libro borrado correctamente"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, 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:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados correctamente"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, 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:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s a sido subido"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
@@ -411,457 +448,470 @@ msgstr "Ocurrió un error al convertir este libro: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "La configuración de Google Drive no se ha completado, intente desactivar y activar Google Drive nuevamente"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s no encontrado: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Correo de prueba de Calibre-Web"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Comprobar correo electrónico"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Primeros pasos con Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Correo electrónico: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: 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:338
+#: 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:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Error al descargar la cubierta"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Error en el formato de la cubierta"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Error al crear una ruta para la cubierta"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 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:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Siki kis archivos jpg/jpeg están soportados como cubierta"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "No se ha encontrado el binario del comando UnRar"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Error ejecutando UnRar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Esperando"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Fallido"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Comenzado"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Finalizado"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Configuración de Kobo"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Error al iniciar sesión con GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Error al obtener la información del usuario de GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Error al iniciar sesión con Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 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:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "El enlace a %(oauth)s se ha realizado correctamente"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Acceso erróneo, ningún usuario enlazado con la cuenta OAuth"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "%(oauth)s desenlazado con éxito"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Error al desenlazar %(oauth)s"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "No vinculado con %(oauth)s"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "Error en GitHub Oauth, por favor, vuelva a intentarlo más tarde."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Error en Google Oauth, por favor vuelva a intentarlo más tarde."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "iniciar sesión"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Token no encontrado"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "El token ha expirado"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "¡Correcto! Por favor regrese a su dispositivo"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Añadido recientemente"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Mostrar libros recientes"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Libros populares"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Mostrar libros populares"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Libros mejor valorados"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Mostrar libros mejor valorados"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Libros leídos"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Mostrar leídos y no leídos"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Libros no leídos"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Mostrar no leído"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Descubrir"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Mostrar libros al azar"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Categorías"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Mostrar selección de categorías"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Series"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Mostrar selección de series"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Autores"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Mostrar selección de autores"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Editores"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Mostrar selección de editores"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Idiomas"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Mostrar selección de idiomas"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Calificaciones"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Mostrar selección de calificaciones"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Formatos de archivo"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Mostrar selección de formatos de archivo"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Libros archivados"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Mostrar libros archivados"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Estante especificado inválido"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Lo sentimos, no tiene permisos para agregar un libro al estante: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "El libro ya forma parte del estante: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "No tiene permiso para añadir un libro a el estante: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Los libros ya forman parte del estante: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Los libros han sido añadidos al estante: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "No se pudieron agregar libros al estante: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue eliminado del estante: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Ya existe un estante público con el nombre '%(title)s'."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Ya existe un estante privado con el nombre '%(title)s'."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Estante: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Error al abrir un estante. El estante no existe o no es accesible"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Libro oculto"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Añadido recientemente"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Estante: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Mostrar libros recientes"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Libros populares"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Mostrar libros populares"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Libros mejor valorados"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Libros leídos"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Libros no leídos"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Mostrar no leído"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Descubrir"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Mostrar libros al azar"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Categorías"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Mostrar selección de categorías"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Series"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Mostrar selección de series"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Autores"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Mostrar selección de autores"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Editores"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Mostrar selección de editores"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Idiomas"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Mostrar selección de idiomas"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Calificaciones"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Mostrar selección de calificaciones"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Formatos de archivo"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Mostrar selección de formatos de archivo"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr "Libros archivados"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Mostrar libros archivados"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Error al abrir un estante. El estante no existe o no es accesible"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -892,254 +942,222 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Error: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Error al crear al menos un usuario LDAP"
-
-#: cps/web.py:392
-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:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Libros"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 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:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, 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:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 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:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "iniciar sesión"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Token no encontrado"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "El token ha expirado"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "¡Correcto! Por favor regrese a su dispositivo"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Falló Ebook-converter: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1182,7 +1200,6 @@ 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:70
 msgid "Download"
 msgstr "Descargar"
 
@@ -1195,9 +1212,8 @@ msgid "Edit"
 msgstr "Editar"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1237,10 +1253,6 @@ msgstr "Login SMTP"
 msgid "From E-mail"
 msgstr "Desde el correo"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Editar la configuración básica"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Configuración"
@@ -1249,7 +1261,7 @@ msgstr "Configuración"
 msgid "Calibre Database Directory"
 msgstr "Directorio de la base de datos de Calibre"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Nivel de registro"
 
@@ -1289,6 +1301,10 @@ msgstr "Acceso mediante Proxy inverso"
 msgid "Reverse proxy header name"
 msgstr "Nombre de cabecera de proxy inverso"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Editar la configuración básica"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Editar la configuración de la interfaz de usuario"
@@ -1346,16 +1362,17 @@ msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quieres reiniciar?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1375,44 +1392,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "En la Librería"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "reducir"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Más de"
 
@@ -1448,13 +1465,13 @@ msgstr "Convertir libro"
 msgid "Book Title"
 msgstr "Título del libro"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Descripción"
 
@@ -1462,15 +1479,15 @@ msgstr "Descripción"
 msgid "Identifiers"
 msgstr "Identificadores"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "Tipo de identificador"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "Valor de identificador"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Borrar"
 
@@ -1478,7 +1495,7 @@ msgstr "Borrar"
 msgid "Add Identifier"
 msgstr "Añadir identificador"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -1502,8 +1519,8 @@ 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:259
-#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Editor"
@@ -1513,11 +1530,13 @@ msgstr "Editor"
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Sí"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "No"
 
@@ -1529,47 +1548,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Guardar"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Palabra clave"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Buscar por palabras clave "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Cerrar"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Origen"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "¡No se encontraron resultados! Por favor intenta con otra palabra clave."
 
@@ -1674,303 +1694,307 @@ msgstr "Configuración de la librería"
 msgid "Location of Calibre Database"
 msgstr "Ubicación de la base de datos de Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "¿Usar Google Drive?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Problema con la configuración de Google Drive"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Autentificar Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Por favor, pulsa enviar para continuar con la configuración"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Por favor finalice la configuración de Google Drive después de iniciar sesión"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Carpeta de Google Drive para Calibre"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Revocar"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Puerto del servidor"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Ubicación del archivo de certificado SSL (dejar en blanco si no hay un servidor SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Ubicación del archivo clave SSL (dejar en blanco si no hay un servidor SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Canal de actualización"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Estable"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Nocturno (versiones en desarrollo)"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Configuración del archivo de registro"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Ubicación y nombre del archivo de registro (si no se especifica será calibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Habilitar registro de acceso"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Ubicación y nombre del archivo de registro de acceso (access.log no tiene ninguna entrada)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Configuración de características"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Permitir subidas"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Formatos de archivo permitidos para subida"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Permitir navegación anónima"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Permitir registro público"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Utilizar eMail como nombre de usuario"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Permitir inicio de sesión remoto (\"magic link\")"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Activar la sincronización con Kobo"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Peticiones proxy a la tienda Kobo desconocidas"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr "Puerto externo del servidor (para peticiones API)"
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Usar Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Obtener una API Key"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API Key"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Permitir Autenticación Proxy Inversas"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Nombre de cabecera de Proxy inverso"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Tipo de inicio de sesión"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Usar autenticación estándar"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Usar autenticación LDAP"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Usar OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Nombre de host o dirección IP del servidor LDAP"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "Puerto del servidor LDAP"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "Encriptación LDAP"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ninguno"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Autenticación LDAP"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "No autenticado"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Simple"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nombre de usuario de administrador LDAP"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Contraseña de administrador LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Nombre distinguido LDAP (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Filtro de objetos de usuario LDAP"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "¿El servidor LDAP es OpenLDAP?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "La siguiente configuración son necesarias para la importación de usuarios"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtro de objetos de grupo LDAP"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Nombre de grupo LDAP"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Campo de miembros de grupo LDAP"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Obtener la Credencial OAuth de %(provider)s"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "Id de cliente de OAuth de %(provider)s"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "Secreto OAuth de Cliente de %(provider)s"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Binarios externos"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Ruta para Calibre E-Book Converter"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Configuración de Calibre E-Book Converter"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Ruta para Kepubify E-Book Converter"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Ubicación del binario de Unrar"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -2169,10 +2193,6 @@ msgstr "Introducir nombre de dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominios prohibidos (Blaclist)"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Siguiente"
@@ -2193,19 +2213,21 @@ msgstr "Abrir una incidencia"
 msgid "Return to Home"
 msgstr "Volver al inicio"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2277,8 +2299,7 @@ msgstr "Libros organizados en estanterías"
 msgid "Home"
 msgstr "Inicio"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Regresar"
 
@@ -2307,7 +2328,7 @@ msgstr "Cerrar sesión"
 msgid "Register"
 msgstr "Registro"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Cargando..."
 
@@ -2331,11 +2352,11 @@ msgstr "Previo"
 msgid "Book Details"
 msgstr "Detalles del libro"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Error"
 
@@ -2419,6 +2440,30 @@ msgstr "Nota de Kobo importante:los libros borrados permanecerán en los disposi
 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/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Cátalogo de ebook de Calibre-Web"
@@ -2579,23 +2624,27 @@ msgstr "Fecha de publicación desde"
 msgid "Published Date To"
 msgstr "Fecha de publicación hasta"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Excluir etiquetas"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Excluir series"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Excluir idiomas"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Extensiones excluidas"
 
@@ -2612,18 +2661,22 @@ msgid "Delete this Shelf"
 msgstr "Borrar este estante"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Editar estante"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Cambiar orden"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "El estante se borrará para todos los usuarios"
 
@@ -2635,6 +2688,10 @@ msgstr "Compartir con todos"
 msgid "Drag to Rearrange Order"
 msgstr "Pinchar y arrastrar para reordenar"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Libro oculto"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Estadísticas de la Biblioteca"
@@ -2735,15 +2792,11 @@ msgstr "Crear/Ver"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Añadir columnas de valores propios de Permitidos/Denegados"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Borrar usuario"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Generar Auth URL de Kobo"
 
-#: 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 5fcd5974..40a13cc4 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 cc18274d..5de9c2a2 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -30,276 +30,313 @@ msgstr "ei asennettu"
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Palvelin uudelleenkäynnistetty, ole hyvä ja päivitä sivu"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Palvelinta sammutetaan, ole hyvä ja sulje sivu"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Ylläpitosivu"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Oletko varma, että haluat poistaa hyllyn?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Pääkäyttäjiä ei jää jäljelle, käyttäjää ei voi poistaa"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 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:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Tapahtui tuntematon virhe."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testisähköposti lähetetty onnistuneesti osoitteeseen %(kindlemail)s"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 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:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr ""
@@ -308,98 +345,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "muokkaa metadataa"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ei ole kelvollinen kieli"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "Kirjan editoinnissa tapahtui virhe, tarkista virheilmoitus lokista"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
@@ -408,457 +445,470 @@ msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive asetukset ei ole valmiit. Koita poistaa Google Drive käytöstä ja ottaa se uudelleen käyttöön"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s ei löydy: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web testisähköposti"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Testi sähköposti"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Aloita Calibre-Web:in käyttö"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Sähköposti: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Aloitettu"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Valmistui"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "GitHubiin kirjautuminen epäonnistui."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Käyttäjätietojen haku GitHubista epäonnistui"
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Googleen kirjautuminen epäonnistui."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 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:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth virhe, yritä myöhemmin uudelleen."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth virhe, yritä myöhemmin uudelleen."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "kirjaudu"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Valtuutusta ei löytynyt"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Valtuutus vanhentunut"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Viimeksi lisätty"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Näytä viimeisimmät kirjat"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Kuumat kirjat"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Näytä kuumat kirjat"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Parhaiten arvioidut kirjat"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Näytä parhaiten arvioidut kirjat"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Luetut kirjat"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Näytä luetut ja lukemattomat"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Lukemattomat kirjat"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Näyt lukemattomat"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Löydä"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Näytä satunnaisia kirjoja"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Kategoriat"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Näytä kategoriavalinta"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Sarjat"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Näytä sarjavalinta"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Kirjailijat"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Näytä kirjailijavalinta"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Julkaisijat"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Näytä julkaisijavalinta"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Kielet"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Näytä keilivalinta"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Arvostelut"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Näytä arvosteluvalinta"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Tiedotomuodot"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Näytä tiedostomuotovalinta"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Virheellinen hylly valittu"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Valitettavasti sinulla ei ole oikeutta lisätä kirjaa hyllyyn: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Kirja on jo hyllyssä: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Kirja on lisätty hyllyyn: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Sinulla ei ole oikeutta lisätä kirjaa hyllyyn: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Kirjat on jo osa hyllyssä: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Kirjat on lisätty hyllyyn: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Kirjojen lisäys hyllyyn: %(sname)s epäonnistui"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Kirja on poistettu hyllystä: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Valitettavsti sinulla ei ole oikeutta poistaa kirjaa hyllystä: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hylly %(title)s luotu"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "luo hylly"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hylly %(title)s muutettu"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Muokkaa hyllyä"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Hylly: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr ""
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Viimeksi lisätty"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Hylly: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Näytä viimeisimmät kirjat"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Kuumat kirjat"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Näytä kuumat kirjat"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Parhaiten arvioidut kirjat"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Luetut kirjat"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Lukemattomat kirjat"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Näyt lukemattomat"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Löydä"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Näytä satunnaisia kirjoja"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Kategoriat"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Näytä kategoriavalinta"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Sarjat"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Näytä sarjavalinta"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Kirjailijat"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Näytä kirjailijavalinta"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Julkaisijat"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Näytä julkaisijavalinta"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Kielet"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Näytä keilivalinta"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Arvostelut"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Näytä arvosteluvalinta"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Tiedotomuodot"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Näytä tiedostomuotovalinta"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -889,254 +939,222 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Kirjat"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Hae"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "rekisteröidy"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "kirjaudu"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Valtuutusta ei löytynyt"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Valtuutus vanhentunut"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Lue kirja"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-kirjan muunnos epäonnistui: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1179,7 +1197,6 @@ 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:70
 msgid "Download"
 msgstr "Lataa"
 
@@ -1192,9 +1209,8 @@ msgid "Edit"
 msgstr "Muokkaa"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Poista"
 
@@ -1234,10 +1250,6 @@ msgstr "SMTP tunnus"
 msgid "From E-mail"
 msgstr "Lähettäjän sähköposti"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr ""
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Asetukset"
@@ -1246,7 +1258,7 @@ msgstr "Asetukset"
 msgid "Calibre Database Directory"
 msgstr "Calibre DB hakemisto"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Lokitaso"
 
@@ -1286,6 +1298,10 @@ msgstr ""
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
@@ -1343,16 +1359,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr ""
 
@@ -1372,44 +1389,44 @@ msgstr ""
 msgid "In Library"
 msgstr "Kirjastossa"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "vähennä"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Enemmän"
 
@@ -1445,13 +1462,13 @@ msgstr "Muunna kirja"
 msgid "Book Title"
 msgstr "Kirjan otsikko"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Kirjailija"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -1459,15 +1476,15 @@ msgstr "Kuvaus"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1475,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Tunnisteet"
 
@@ -1499,8 +1516,8 @@ msgstr "Lataa kuva paikalliselta levyltä"
 msgid "Published Date"
 msgstr "Julkaisupäivä"
 
-#: 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Julkaisija"
@@ -1510,11 +1527,13 @@ msgstr "Julkaisija"
 msgid "Language"
 msgstr "Kieli"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Kyllä"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ei"
 
@@ -1526,47 +1545,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Avainsana"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Hae avainsanaa "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Sulje"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Lähde"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Hakuvirhe!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Ei osumia! Kokeile jotain tosita hakusanaa."
 
@@ -1671,303 +1691,307 @@ msgstr "Kirjaston asetukset"
 msgid "Location of Calibre Database"
 msgstr "Calibre -tietokannan paikka"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Käytä Google Drivea?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive -asetuksissa ongelma"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Autentikoi Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Ole hyvä ja paina lähetä jatkaaksesi asennusta"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Ole hyvä ja tee Google Drive asetukset loppuun kirjautumisen jälkeen"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre -kansio"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Katso kanava ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Kumoa"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Palvelinasetukset"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Palvelimen portti"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL sertifikaatin paikka (jätä tyhjäksi ei-SSL -palvelimella)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL avaintiedoston paikka (jätä tyhjäksi ei-SSL -palvelimella)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Päivityskanava"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Vakaa"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Öinen"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Lokitiedoston asetukset"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Lokitiedoston nimi ja paikka (calibre-web.log jos ei asetettu)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Ota pääsyloki käyttöön"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Pääsylokitiedoston nimi ja paikka (access.log jos ei asetettu)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Salli lähetys"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Salli nimetön selailu"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Salli julkinen rekisteröinti"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Salli etäkirjautuminen (\"magic link\")"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr ""
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Käytä Goodreads -palvelua"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Hae API-avain"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API-avain"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API-salaisuus"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Kirjautumisen tyyppi"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Käytä oletuskirjautumista"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Käytä LDAP kirjautumista"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Käytä OAuth kirjautumista"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP palvelimen nimi tai IP osoite"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "LDAP Palveimen portti"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ei mitään"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP pääkäyttäjän käyttäjänimi"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP pääkäyttäjän salasana"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP DN"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP käyttäjä suodin (object filter)"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP palvelin on OpenLDAP?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Hanki %(provider)s OAuth valtuutus"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth asiakas Id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth asiakas salaisuus"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Ulkoiset binäärit"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrar binäärin paikka"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Kirjaudu sisään"
@@ -2166,10 +2190,6 @@ msgstr "Syötä domainnimi"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Seuraava"
@@ -2190,19 +2210,21 @@ msgstr "Luo virheilmoitus"
 msgid "Return to Home"
 msgstr "Palaa kotiin"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2274,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "Koti"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Palaa"
 
@@ -2304,7 +2325,7 @@ msgstr "Kirjaudu ulos"
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Ladataan..."
 
@@ -2328,11 +2349,11 @@ msgstr "Edellinen"
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Virhe"
 
@@ -2416,6 +2437,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-kirjaluettelo"
@@ -2576,23 +2621,27 @@ msgstr "Julkaisupäivästä"
 msgid "Published Date To"
 msgstr "Julkaisupäivään"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Poissulje merkintä"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Poissulje sarja"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Poissulje kieli"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
@@ -2609,18 +2658,22 @@ msgid "Delete this Shelf"
 msgstr "Poista tämä hylly"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Muuta hyllyä"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Muuta järjestystä"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Hylly poistetaan kaikilta ja ikuisesti!"
 
@@ -2632,6 +2685,10 @@ msgstr "pitäisikö hyllyn olla julkinen?"
 msgid "Drag to Rearrange Order"
 msgstr "Vedä ja pudota muuttaaksesi järjestystä"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr ""
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Calibre -kirjaston tilastot"
@@ -2732,15 +2789,11 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Poista tämä käyttäjä"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: 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 85ae5d7a..58a4159e 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 c07983d4..cc900f7f 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: Dekani <dekani1500@gmail.com>\n"
 "Language: fr\n"
@@ -44,276 +44,313 @@ msgstr "non installé"
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Reconnecté avec succès"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Page admin"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Voulez-vous vraiment supprimer le jeton Kobo?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Voulez-vous vraiment supprimer l’étagère?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json n'est pas configuré pour l'application Web"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier logfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Access Logfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Veuillez saisir un fournisseur LDAP, Port, DN et l'identifiant objet de l'utilisateur"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre objet du groupe LDAP a besoin d'un identifiant de format \"%s\""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Le filtre objet du groupe LDAP a une parenthèse non gérée"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre objet de l'utilisateur LDAP a besoin d'un identifiant de format \"%s\""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Le filtre objet de l'utilisateur LDAP a une parenthèse non gérée"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Keyfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 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:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement DB est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "La DB n'est pas accessible en écriture"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 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:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 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:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, 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:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, 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:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 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:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 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:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 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"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Erreur : %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Erreur : Aucun utilisateur renvoyé dans la réponse LDAP du serveur"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Impossible de créer au moins un utilisateur LDAP"
+
+#: cps/admin.py:1424
+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/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "non configuré"
@@ -322,98 +359,98 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Le format du livre a été supprimé avec succès"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, 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:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, 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:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, 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:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 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:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +459,470 @@ msgstr "Une erreur est survenue au cours de la conversion du livre : %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "La configuration de Google Drive n’est pas terminée, essayez de désactiver et d’activer à nouveau Google Drive"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s introuvable : %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Courriel de test de Calibre-Web"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Courriel de test"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Bien démarrer avec Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Courriel : %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: 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:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Erreur lors du téléchargement de la couverture"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Erreur de format de couverture"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Impossible de créer le chemin pour la couverture"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 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:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 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:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "En attente"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Echoué"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Débuté"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Terminé"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Configuration Kobo"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Échec de la connexion avec GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Impossible d’obtenir les informations d’utilisateur à partir de GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Échec de la connexion avec Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 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:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Lien vers %(oauth)s effectué avec succès"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "La connexion a échoué, aucun utilisateur lié au compte OAuth"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Suppression de la liaison vers %(oauth)s effectuée avec succès"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Suppression de la liaison vers %(oauth)s a échoué"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "Erreur Oauth GitHub, veuillez réessayer plus tard."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Erreur Oauth Google, veuillez réessayer plus tard."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "connexion"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Jeton non trouvé"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Jeton expiré"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Réussite! Merci de vous tourner vers votre appareil"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Ajouts récents"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Afficher les livres récents"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Livres populaires"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Montrer les livres populaires"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Livres les mieux notés"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Montrer les livres les mieux notés"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Livres lus"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Montrer lus et non-lus"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Livres non-lus"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Afficher non-lus"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Découvrir"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Montrer des livres au hasard"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Catégories"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Montrer la sélection par catégories"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Séries"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Montrer la sélection par séries"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Auteurs"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Montrer la sélection par auteur"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Éditeurs"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Montrer la sélection par éditeur"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Langues"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Montrer la sélection par langue"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Notes"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Afficher la sélection des évaluations"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Formats de fichier"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Afficher la sélection des formats de fichiers"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Livres archivés"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Afficher les livres archivés"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "L’étagère indiquée est invalide"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Désolé, vous n’êtes pas autorisé à ajouter un livre dans l’étagère: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Ce livre est déjà sur l’étagère : %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Vous n’êtes pas autorisé à ajouter un livre dans l’étagère : %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Ces livres sont déjà sur l’étagère : %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Les livres ont été ajoutés à l’étagère : %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Impossible d’ajouter les livres à l’étagère : %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Une étagère publique avec le nom '%(title)s' existe déjà."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Une étagère privée avec le nom '%(title)s' existe déjà."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "L’étagère %(title)s a été modifiée"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Étagère : '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Livre caché"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Ajouts récents"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Étagère : '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Afficher les livres récents"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Livres populaires"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Montrer les livres populaires"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Livres les mieux notés"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Livres lus"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Livres non-lus"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Afficher non-lus"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Découvrir"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Montrer des livres au hasard"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Catégories"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Montrer la sélection par catégories"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Séries"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Montrer la sélection par séries"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Auteurs"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Montrer la sélection par auteur"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Éditeurs"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Montrer la sélection par éditeur"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Langues"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Montrer la sélection par langue"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Notes"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Afficher la sélection des évaluations"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Formats de fichier"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Afficher la sélection des formats de fichiers"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr "Livres archivés"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Afficher les livres archivés"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -903,254 +953,222 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Erreur : %(ldaperror)s"
-
-#: cps/web.py:323
-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:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Impossible de créer au moins un utilisateur LDAP"
-
-#: cps/web.py:392
-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:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Livres"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, 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/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, 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:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 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:1642
+#: cps/web.py:1377
 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:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "connexion"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Jeton non trouvé"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Jeton expiré"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Réussite! Merci de vous tourner vers votre appareil"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "ebook-convert calibre %(tool)s non trouvé"
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "La commande Kepubify-converter a échouée : %(error)s"
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, 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
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "La commande ebook-convert a échouée : %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1193,7 +1211,6 @@ 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:70
 msgid "Download"
 msgstr "Télécharger"
 
@@ -1206,9 +1223,8 @@ msgid "Edit"
 msgstr "Éditer"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1248,10 +1264,6 @@ msgstr "Compte utilisateur SMTP"
 msgid "From E-mail"
 msgstr "Expéditeur des courriels"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Éditer la configuration principale"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Configuration"
@@ -1260,7 +1272,7 @@ msgstr "Configuration"
 msgid "Calibre Database Directory"
 msgstr "Répertoire de la base de données Calibre"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Niveau de journalisation"
 
@@ -1300,6 +1312,10 @@ msgstr "Compte du Reverse Proxy"
 msgid "Reverse proxy header name"
 msgstr "Nom de l'en-tête du Reverse Proxy"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Éditer la configuration principale"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
@@ -1357,16 +1373,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1386,44 +1403,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "Dans la librairie"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "réduire"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Plus de"
 
@@ -1459,13 +1476,13 @@ msgstr "Convertir le livre"
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Description"
 
@@ -1473,15 +1490,15 @@ msgstr "Description"
 msgid "Identifiers"
 msgstr "Identifiants"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "Type d'identifiant"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "Valeur d'identifiant"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1489,7 +1506,7 @@ msgstr "Supprimer"
 msgid "Add Identifier"
 msgstr "Ajouter un identifiant"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Étiquettes"
 
@@ -1513,8 +1530,8 @@ 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:259
-#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Éditeur"
@@ -1524,11 +1541,13 @@ msgstr "Éditeur"
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Oui"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Non"
 
@@ -1540,47 +1559,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Fermer"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Source"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Erreur lors de la recherche!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Aucun résultat. Veuillez essayer avec un nouveau mot clé."
 
@@ -1685,303 +1705,307 @@ msgstr "Configuration de la Bibliothèque"
 msgid "Location of Calibre Database"
 msgstr "Emplacement de la base de données Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Utiliser Google Drive ?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Problème avec la configuration Google Drive"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Authentification Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Veuillez cliquer sur soumettre pour continuer l’initialisation"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Veuillez terminer la configuration de Google Drive après la connexion"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Répertoire Google Drive pour Calibre"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Révoquer"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Numéro de port du serveur"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Emplacement du fichier certificat SSL (laisser vide pour les serveurs non SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Emplacement du fichier Keyfile de chiffrement SSL (laisser vide pour les serveurs non SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Canal de mise à jour"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Stable"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Nightly"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Configuration du fichier journal"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Emplacement et nom du fichier journal (sera calibre-web.log si vide)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Activer le journal des accès"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Emplacement et nom du fichier journal d’accès (access.log pour aucune entrée)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Configuration des options"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Autoriser le téléversement de fichier"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Formats de fichiers à télécharger autorisés"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Autoriser la navigation anonyme"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Autoriser l’inscription publique"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Utiliser l'e-mail comme nom d'utilisateur"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Activer la connexion à distance Magic Link"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Activer la synchro Kobo"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Requêtes du Proxy inconnues vers le magasin Kobo"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Utiliser Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Obtenir la clé API"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Clé de l’API Goodreads"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Secret de l’API Goodreads"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Autoriser l'authentification Reverse Proxy"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Nom de l'en-tête du Reverse Proxy"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Type de connexion"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Utiliser l’authentification standard"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Utiliser l’authentification LDAP"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Utiliser OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Nom d'hôte ou Adresse IP du serveur LDAP"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "Port du serveur LDAP"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "Chiffrement LDAP"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Aucun"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Authentification LDAP"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Non authentifié"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Simple"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nom d'utilisateur de l'administrateur LDAP"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Mot de passe de l'administrateur LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Filtre objet de l'utilisateur LDAP"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Est-ce que le serveur LDAP est OpenLDAP?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "Les paramètres suivant sont nécessaires pour importer un utilisateur"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtre objet de groupe LDAP"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Nom de groupe LDAP"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Champ des membres de groupe LDAP"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Obtenir les identifiants OAuth %(provider)s"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "Client Id OAuth %(provider)s"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "Client secret OAuth %(provider)s"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Configuration des outils de conversion externes"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Chemin vers le convertisseur de livres Calibre"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Paramètres du convertisseur de livres Calibre"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Chemin vers le convertisseur de livres Kepubify"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Chemin d’accès à la commande UnRar"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Connexion"
@@ -2180,10 +2204,6 @@ msgstr "Saisir le nom du domaine"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domaines refusés (Liste noire)"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Suivant"
@@ -2204,19 +2224,21 @@ msgstr "Signaler un problème"
 msgid "Return to Home"
 msgstr "Retour à l’accueil"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2288,8 +2310,7 @@ msgstr "Livres organisés par étagères"
 msgid "Home"
 msgstr "Accueil"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Retour"
 
@@ -2318,7 +2339,7 @@ msgstr "Déconnexion"
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Téléversement en cours..."
 
@@ -2342,11 +2363,11 @@ msgstr "Précédent"
 msgid "Book Details"
 msgstr "Détails du livre"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Erreur"
 
@@ -2430,6 +2451,30 @@ msgstr "Note Kobo importante: les livres supprimés vont rester sur l'appareil K
 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/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Catalogue de livres électroniques Calibre-Web"
@@ -2590,23 +2635,27 @@ msgstr "Date de publication (depuis)"
 msgid "Published Date To"
 msgstr "Date de publication (jusqu’à)"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Exclure les étiquettes"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Exclure les séries"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Exclure les langues"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Extensions"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Exclure les extensions"
 
@@ -2623,18 +2672,22 @@ msgid "Delete this Shelf"
 msgstr "Supprimer cette étagère"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Modifier l’étagère"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Modifier l’ordre"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "L’étagère sera supprimée pour tous les utilisateus"
 
@@ -2646,6 +2699,10 @@ msgstr "Partager avec tout le monde"
 msgid "Drag to Rearrange Order"
 msgstr "Glisser-déposer pour modifier l’ordre"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Livre caché"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Statistiques de la librairie Calibre"
@@ -2746,15 +2803,11 @@ msgstr "Créer/visualiser"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Ajouter les valeurs de colonnes personnalisées autorisées/refusées"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Supprimer l'utilisateur"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Générer l'URL d'authentification Kobo"
 
-#: 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 ac64c6a7..afabf31f 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 0697d35a..3871d0a4 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -30,276 +30,313 @@ msgstr "nincs telepítve"
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "A kiszolgáló leállítása folyamatban, zárd be ezt az ablakot"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Rendszergazda oldala"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Valóban törölni akarod a polcot?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 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:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Ismeretlen hiba történt."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, 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:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, 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:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 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:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 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:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 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:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 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:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr ""
@@ -308,98 +345,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, 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:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, 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:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 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:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +445,470 @@ msgstr "Hiba történt a könyv átalakításakor: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni és újra aktíválni a Google Drive-ot."
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nem található: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web teszt e-mail"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Teszt e-mail"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Kezdő lépések a Calibre-Web-bel"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Nem sikerült"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Elindítva"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Végrehajtva"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "belépés"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "A token nem található."
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "A token érvényessége lejárt."
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Sikerült! Újra használható az eszköz."
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Legutóbb hozzáadott"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Legutóbbi könyvek mutatása"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Kelendő könyvek"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Kelendő könyvek mutatása"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Legjobb könyvek"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Legjobbra értékelt könyvek mutatása"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Olvasott könyvek"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Mutassa az olvasva/olvasatlan állapotot"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Olvasatlan könyvek"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr ""
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Felfedezés"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Könyvek találomra mutatása"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Címkék"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Címke választó mutatása"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Sorozatok"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Sorozat választó mutatása"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Szerzők"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Szerző választó mutatása"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Kiadók"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Kiadó választó mutatása"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Nyelvek"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Nyelv választó mutatása"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr ""
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr ""
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "A megadott polc érvénytelen!"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Elnézést, nem vagy jogosult hozzáadni a könyvet a következő polcra: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "A könyv már a következő polcon van: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "A könyv hozzá lett adva a következő polchoz: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Nincs jogosultságod könyvet tenni a következő polcra: %(name)s."
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "A könyvek már a következő polcon vannak: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "A könyvek hozzá lettek adva a következő polchoz: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Nem sikerült hozzáadni a könyveket a polchoz: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "A könyv el lett távolítva a polcról: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Sajnálom, nincs jogosultságot eltávolítani könyvet erről a polcról: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "A következő polc létre lett hozva: %(title)s"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Hiba történt"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "A következő polc megváltoztatva: %(title)s"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Polc szerkesztése"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Polc: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr ""
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Legutóbb hozzáadott"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Polc: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Legutóbbi könyvek mutatása"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Kelendő könyvek"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Kelendő könyvek mutatása"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Legjobb könyvek"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Olvasott könyvek"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Olvasatlan könyvek"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr ""
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Felfedezés"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Könyvek találomra mutatása"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Címkék"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Címke választó mutatása"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Sorozatok"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Sorozat választó mutatása"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Szerzők"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Szerző választó mutatása"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Kiadók"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Kiadó választó mutatása"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Nyelvek"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Nyelv választó mutatása"
-
-#: 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:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -889,254 +939,222 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "regisztrálás"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 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:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "belépés"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "A token nem található."
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "A token érvényessége lejárt."
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Sikerült! Újra használható az eszköz."
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Egy olvasott könyv"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, 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
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1179,7 +1197,6 @@ 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:70
 msgid "Download"
 msgstr "Letöltés"
 
@@ -1192,9 +1209,8 @@ msgid "Edit"
 msgstr "Szerkesztés"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Törlés"
 
@@ -1234,10 +1250,6 @@ msgstr "SMTP felhasználó"
 msgid "From E-mail"
 msgstr "Küldő e-mail cím"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr ""
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguráció"
@@ -1246,7 +1258,7 @@ msgstr "Konfiguráció"
 msgid "Calibre Database Directory"
 msgstr "Calibre adatbázis mappája:"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Naplózás szintje:"
 
@@ -1286,6 +1298,10 @@ msgstr ""
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
@@ -1343,16 +1359,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr ""
 
@@ -1372,44 +1389,44 @@ msgstr "keresztül"
 msgid "In Library"
 msgstr "Könyvtárban"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "csökkentsd"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Több eszerint:"
 
@@ -1445,13 +1462,13 @@ msgstr "Könyv konvertálása"
 msgid "Book Title"
 msgstr "Könyv címe"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Szerző"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Leírás"
 
@@ -1459,15 +1476,15 @@ msgstr "Leírás"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1475,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Címkék"
 
@@ -1499,8 +1516,8 @@ 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:259
-#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Kiadó"
@@ -1510,11 +1527,13 @@ msgstr "Kiadó"
 msgid "Language"
 msgstr "Nyelv"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Igen"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nem"
 
@@ -1526,47 +1545,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Kulcsszó"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Keresési kulcsszó "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Bezárás"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Forrás"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Keresési hiba!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nincs találat! Próbálj másik kulcsszót."
 
@@ -1671,303 +1691,307 @@ msgstr "Könyvát beállításai"
 msgid "Location of Calibre Database"
 msgstr "Calibra adatbázis helye"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Használjon Google Drive-ot?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive beállítási probléma"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Google Drive hitelesítés"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "A beállítás folytatásához kattints a Küldés gombra"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Belépés után fejezd be a Google Drive beállítást"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre mappa"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Visszavonás"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Szerver beállítások"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Szerver port"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL hitelesítő fájl helye (nem SSL szerverekhez üresen kell hagyni)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL kulcsfájl helye (nem SSL szerverekhez üresen kell hagyni)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Frissítési forrás"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Stabil"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Éjszakai"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Naplózási beállítások"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Naplófájl helye és neve (üresen hagyva calibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr ""
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Feltöltés engedélyezése"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Böngészés bejelentkezés nélkül engedélyezése"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Nyilvános regisztráció engedélyezése"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Távoli belépés engedélyezése (\"varázs-hivatkozás\")"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr ""
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "API-kulcs beszerzése"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API-kulcs"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API titkos kód"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Nincs"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
-#, python-format
-msgid "Obtain %(provider)s OAuth Credential"
-msgstr ""
-
-#: cps/templates/config_edit.html:357
-#, python-format
-msgid "%(provider)s OAuth Client Id"
-msgstr ""
-
 #: cps/templates/config_edit.html:361
 #, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:364
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:368
+#, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Külső futtatható fájlok"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Az Unrar futtatási állományának helye"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Belépés"
@@ -2166,10 +2190,6 @@ msgstr "Tartomány megadása"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Következő"
@@ -2190,19 +2210,21 @@ msgstr ""
 msgid "Return to Home"
 msgstr "Vissza a kezdőlapra"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2274,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Vissza"
 
@@ -2304,7 +2325,7 @@ msgstr "Kilépés"
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -2328,11 +2349,11 @@ msgstr "Előző"
 msgid "Book Details"
 msgstr "Könyv részletei"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Hiba"
 
@@ -2416,6 +2437,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-könyv katalógus"
@@ -2576,23 +2621,27 @@ msgstr "Kiadás éve ettől: "
 msgid "Published Date To"
 msgstr "Kiadás éve eddig: "
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Cimkék kizárása"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Sorozatok kizárása"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Nyelvek kizárása"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
@@ -2609,18 +2658,22 @@ msgid "Delete this Shelf"
 msgstr "Polc törlése"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Polc szerkesztése"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Sorrend változtatása"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "A polc el fog tűnni mindenki számára és örökké!"
 
@@ -2632,6 +2685,10 @@ msgstr "Nyilvános polc"
 msgid "Drag to Rearrange Order"
 msgstr "Húzd és dob a sorrend változtatásához"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr ""
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "A Calibre könyvár statisztikái"
@@ -2732,15 +2789,11 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "A felhasználó törlése"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: 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 d0e8478c..1c24dad1 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 e336e029..df8427a3 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -29,276 +29,313 @@ msgstr "non installato"
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, per favore ricarica la pagina"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Ricollegato con successo"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Vuoi veramente eliminare il token di Kobo?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Vuoi davvero eliminare questo scaffale?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non è configurato per Web Application"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Logfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione dell'Access Logfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Per favore digita un Provider LDAP, porta, DN e User Object Identifier"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP User Object Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
-msgstr ""
+msgstr "LDAP Member User Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
-msgstr ""
+msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "LDAP CACertificate, il certificato o la posizione della chiave non sono corretti, per favore indica il percorso corretto"
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Keyfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 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:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del DB non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "Il DB non è scrivibile"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 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:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Ho trovato un account creato in precedenza con questa e-mail."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Si è verificato un errore imprevisto."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
-msgstr "Modifica le impostazioni SMTP"
+msgstr "Modifica le impostazioni del server e-mail"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, 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:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Errore: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Fallita la creazione di almeno un utente LDAP"
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Almeno un utente LDAP non è stato trovato nel database"
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr "{} utente importato con successo"
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "non configurato"
@@ -307,98 +344,98 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Il formato del libro è stato eliminato con successo"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "modifica i metadati"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, 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:675
+#: cps/editbooks.py:700
 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:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, 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:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 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:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +444,470 @@ msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "La configurazione di Google Drive non è stata completata correttamente. Prova a disattivare e riattivare nuovamente Google Drive"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s non trovato: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "E-mail di test da Calibre-Web"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "E-mail di test"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Inizia con Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: 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:338
+#: 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:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Errore nello scaricare la copertina"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Errore di formato della copertina"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Errore nel creare la cartella per la copertina"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 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:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 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:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Attendi"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Avviato"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Terminato"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
+msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Configurazione di Kobo"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Accesso con GitHub non è riuscito."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Il recupero delle informazioni dell'utente da GitHub non è riuscito."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "L'accesso con Google non è riuscito."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 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:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Collegamento a %(oauth)s avvenuto con successo"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Accesso non riuscito, non c'è un utente collegato all'account OAuth"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Scollegamento da  %(oauth)s avvenuto con successo"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Scollegamento da  %(oauth)s non riuscito"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "Non collegato a %(oauth)s"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub, errore Oauth: per favore riprova più tardi."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google, errore Oauth: per favore riprova più tardi."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "accedi"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Token non trovato"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Il token è scaduto"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Riuscito! Torna al tuo dispositivo"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Aggiunti recentemente"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Mostra l'opzione per la selezione dei libri più recenti"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Libri popolari"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Mostra l'opzione per la selezione dei libri più popolari"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr "Libri scaricati"
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Libri meglio valutati"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Libri da leggere"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Mostra l'opzione per la selezione letto e non letto"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Libri non letti"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Mostra l'opzione per la selezione dei libri non letti"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Per scoprire"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Mostra l'opzione per presentare libri aleatoriamente"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Categorie"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Mostra l'opzione per la selezione delle categorie"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Serie"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Mostra l'opzione per la selezione delle serie"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Autori"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Mostra l'opzione per la selezione degli autori"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Editori"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Mostra l'opzione per la selezione degli editori"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Lingue"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Mostra l'opzione per la selezione delle lingue"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Valutazioni"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Mostra l'opzione per la selezione della valutazione"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Formati file"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Mostra la selezione del formato dei file"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Libri archiviati"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Mostra l'opzione per la selezione dei libri archiviati"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr "Elenco libri"
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr "Mostra l'opzione per visualizzare i libri sottoforma di elenco"
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Lo scaffale specificato non è valido"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri allo scaffale: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Il libro è gia presente nello scaffale: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Il libro è stato aggiunto allo scaffale: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Non sei autorizzato ad aggiungere libri allo scaffale: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "I libri sono già presenti nello scaffale: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "I libri sono stati aggiunti allo scaffale: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Non posso aggiungere libri allo scaffale: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Spiacente, ma non sei autorizzato a togliere libri dallo scaffale: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Uno scaffale pubblico denominato '%(title)s' esiste già."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Uno scaffale privato denominato '%(title)s' esiste già."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Lo scaffale %(title)s è stato creato"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "C'era un errore"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Lo scaffale %(title)s è stato modificato"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Modifica uno scaffale"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Scaffale: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Libro nascosto"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Aggiunti recentemente"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Scaffale: '%(name)s'"
 
-#: 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:71
-msgid "Hot Books"
-msgstr "Libri popolari"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Mostra l'opzione per la selezione dei libri più popolari"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Libri meglio valutati"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Libri da leggere"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Libri non letti"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Mostra l'opzione per la selezione dei libri non letti"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Per scoprire"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Mostra l'opzione per presentare libri aleatoriamente"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Categorie"
-
-#: 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/book_table.html:51
-#: cps/templates/index.xml:82 cps/templates/search_form.html:54 cps/ub.py:95
-#: cps/web.py:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Serie"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Mostra l'opzione per la selezione delle serie"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Autori"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Mostra l'opzione per la selezione degli autori"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Editori"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Mostra l'opzione per la selezione degli editori"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Lingue"
-
-#: 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:109
-msgid "Ratings"
-msgstr "Valutazioni"
-
-#: 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:112
-msgid "File formats"
-msgstr "Formati file"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Mostra la selezione del formato dei file"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr "Libri archiviati"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Mostra l'opzione per la selezione dei libri archiviati"
-
-#: cps/ub.py:120 cps/web.py:1042
-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/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -888,254 +938,222 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Errore: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Fallita la creazione di almeno un utente LDAP"
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "Almeno un utente LDAP non è stato trovato nel database"
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Libri"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "I libri scaricati da %(user)s"
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, 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/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "registra"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "accedi"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Token non trovato"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Il token è scaduto"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Riuscito! Torna al tuo dispositivo"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Leggi un libro"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Non ho trovato il convertitore %(tool)s di libri di Calibre"
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Non ho trovato il formato %(format)s nel disco"
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr "La conversione del libro è terminata con un errore sconosciuto"
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Si è verificato un errore con il convertitore Kepubify: %(error)s"
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(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
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Errore nel convertitore: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Si è verificato un errore con Calibre: %(error)s"
@@ -1165,7 +1183,7 @@ msgstr "Downloads"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:77
 msgid "Admin"
-msgstr "Amministratore"
+msgstr "Amministrazione"
 
 #: cps/templates/admin.html:17 cps/templates/login.html:12
 #: cps/templates/login.html:13 cps/templates/user_edit.html:22
@@ -1178,7 +1196,6 @@ 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:70
 msgid "Download"
 msgstr "Download"
 
@@ -1191,9 +1208,8 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1211,7 +1227,7 @@ msgstr "Importa gli utenti LDAP"
 
 #: cps/templates/admin.html:53
 msgid "E-mail Server Settings"
-msgstr "Configurazione server SMTP"
+msgstr "Configurazione server e-mail"
 
 #: cps/templates/admin.html:57 cps/templates/email_edit.html:11
 msgid "SMTP Hostname"
@@ -1233,10 +1249,6 @@ msgstr "Login SMTP"
 msgid "From E-mail"
 msgstr "E-mail da"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Edita la configurazione di base"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Configurazione"
@@ -1245,7 +1257,7 @@ msgstr "Configurazione"
 msgid "Calibre Database Directory"
 msgstr "Cartella del database di Calibre"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Livello di log"
 
@@ -1285,6 +1297,10 @@ msgstr "Login reverse proxy"
 msgid "Reverse proxy header name"
 msgstr "Nome intestazione reverse proxy"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Edita la configurazione di base"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Edita la configurazione dell'interfaccia utente"
@@ -1295,7 +1311,7 @@ msgstr "Amministrazione"
 
 #: cps/templates/admin.html:144
 msgid "Download Debug Package"
-msgstr ""
+msgstr "Scarica Debug Package"
 
 #: cps/templates/admin.html:145
 msgid "View Logs"
@@ -1342,16 +1358,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1371,44 +1388,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "Nella libreria"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
-msgstr ""
+msgstr "Ordina secondo la data dei libri, prima i più recenti"
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
-msgstr ""
+msgstr "Ordina secondo la data dei libri, prima i più vecchi"
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
-msgstr ""
+msgstr "Ordina i titoli in ordine alfabetico"
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
-msgstr ""
+msgstr "Ordina i titoli in ordine alfabetico inverso"
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
-msgstr ""
+msgstr "Ordina secondo la data di pubblicazione, prima i più recenti"
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
-msgstr ""
+msgstr "Ordina secondo la data di pubblicazione, prima i più vecchi"
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "riduci"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Altro da"
 
@@ -1444,13 +1461,13 @@ msgstr "Converti libro"
 msgid "Book Title"
 msgstr "Titolo del libro"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autore"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1458,15 +1475,15 @@ msgstr "Descrizione"
 msgid "Identifiers"
 msgstr "Identificatori"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "Tipo di identificatore"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "Valore dell'identificatore"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1474,7 +1491,7 @@ msgstr "Rimuovi"
 msgid "Add Identifier"
 msgstr "Aggiungi un identificatore"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Categorie"
 
@@ -1498,8 +1515,8 @@ 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:259
-#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Editore"
@@ -1509,11 +1526,13 @@ msgstr "Editore"
 msgid "Language"
 msgstr "Lingua"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Sì"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "No"
 
@@ -1525,47 +1544,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Salva"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " ricerca parola chiave "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Fai clic sulla copertina per caricare i metadati nel modulo"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Chiudi"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Errore nella ricerca!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nessun risultato! Prova con un altro criterio di ricerca."
 
@@ -1648,7 +1668,7 @@ 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?"
+msgstr "Sei veramente sicuro?"
 
 #: cps/templates/book_table.html:74
 msgid "Books with Title will be merged from:"
@@ -1670,303 +1690,307 @@ msgstr "Configurazione della libreria"
 msgid "Location of Calibre Database"
 msgstr "Posizione del database di Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Utilizza Google Drive"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Problema nella configurazione di Google Drive"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Autenticazione Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Per favore premi invio per proseguire con la configurazione"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Per favore termina la configurazione di Google Drive dopo il login"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Cartella di Calibre in Google Drive"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "ID canale Watch Metadata"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Revoca"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Configurazione del server"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Porta del server"
 
-#: cps/templates/config_edit.html:93
-msgid "SSL certfile location (leave it empty for non-SSL Servers)"
-msgstr "Percorso del file di certificato SSL (lascia vuoto per una configurazione del server senza SSL)"
-
 #: cps/templates/config_edit.html:100
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "Percorso del file del certificato SSL (lascia vuoto per una configurazione del server senza SSL)"
+
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Percorso del file della chiave SSL (lascia vuoto per una configurazione del server senza SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Canale d'aggiornamento"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Stabile"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Nightly"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Configurazione del Logfile"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Percorso e nome del Logfile (senza indicazioni sarà calibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Abilita l'Access Log"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Percorso e nome del Logfile di accesso (senza indicazioni sarà access.log)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Ulteriori opzioni"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Abilita il caricamento"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Formati di file autorizzati ad essere caricati"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Abilita la navigazione anonima"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Abilita la registrazione pubblica"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Utilizza l'e-mail quale nome di utente"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Attiva login remoto Magic Link"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Abilita la sincronia per Kobo"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Richieste proxy sconosciute allo store di Kobo"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr "Porta esterna del server (per chiamate API alle porte inoltrate)"
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Utilizza Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Otteni una chiave API"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "API di Goodreads"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Permetti l'autenticazione Reverse Proxy"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Nome dell'intestazione Reverse Proxy"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Tipo di login"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Utilizza l'autenticazione standard"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Utilizza l'autenticazione LDAP"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Utilizza OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Nome o indirizzo IP del server LDAP"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "Porta del server LDAP"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "Crittografia LDAP"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Nessuna"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
-msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr ""
-
 #: cps/templates/config_edit.html:274
-msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "Percorso del CACertificate LDAP (necessario unicamente in caso di Client Certificate Authentication)"
 
 #: cps/templates/config_edit.html:281
-msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "Percorso del certificato LDAP (necessario unicamente in caso di Client Certificate Authentication)"
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:288
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "Percorso della chiave LDAP (necessario unicamente in caso di Client Certificate Authentication)"
+
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Autenticazione LDAP"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Non autenticato"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Semplice"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nome di utente dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Password dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
-msgstr "LDAP User object filter"
+msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Il server LDAP è un server OpenLDAP."
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "I seguenti parametri sono necessari per importare utenti"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "LDAP Group Object Filter"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP Group Name"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP Group Members Field"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
-msgstr ""
+msgstr "LDAP Member User Filter Detection"
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
-msgstr ""
+msgstr "Autodetect"
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
-msgstr ""
+msgstr "Filtro personalizzato"
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
-msgstr ""
+msgstr "LDAP Member User Filter"
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Ottieni le credenziali OAuth di %(provider)s"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Files binari esterni"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Percorso del convertitore di libri di Calibre"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Configurazione del convertitore di libri di Calibre"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Percorso del convertitore di libri Kepubify"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Percorso del file binario di UnRar"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Accesso"
@@ -2165,10 +2189,6 @@ msgstr "Digita il nome di dominio"
 msgid "Denied Domains (Blacklist)"
 msgstr "Dominii bloccati per la registrazione (Blacklist)"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Prossimo"
@@ -2189,21 +2209,23 @@ msgstr "Crea un rapporto di segnalazione di un problema"
 msgid "Return to Home"
 msgstr "Ritorna alla pagina principale"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
-msgstr ""
+msgstr "Ordina gli autori in ordine alfabetico"
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
-msgstr ""
+msgstr "Ordina gli autori in ordine alfabetico inverso"
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
-msgstr ""
+msgstr "Ordina in ordine ascendente secondo l'indice della serie"
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
-msgstr ""
+msgstr "Ordina in ordine discendente secondo l'indice della serie"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2273,8 +2295,7 @@ msgstr "Libri organizzati in scaffali"
 msgid "Home"
 msgstr "Home"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Indietro"
 
@@ -2303,7 +2324,7 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registra"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Uploading..."
 
@@ -2327,11 +2348,11 @@ msgstr "Precedente"
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Errore"
 
@@ -2365,11 +2386,11 @@ msgstr "Mostra il log di accesso: "
 
 #: cps/templates/logviewer.html:18
 msgid "Download Calibre-Web Log"
-msgstr ""
+msgstr "Scarica il log di Calibre-Web"
 
 #: cps/templates/logviewer.html:21
 msgid "Download Access Log"
-msgstr ""
+msgstr "Scarica il log di accesso"
 
 #: cps/templates/modal_dialogs.html:6
 msgid "Select Allowed/Denied Tags"
@@ -2415,6 +2436,30 @@ msgstr "Oservazione importante riguardo a Kobo: i libri eliminati, rimarranno in
 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/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Catalogo Calibre-Web"
@@ -2575,23 +2620,27 @@ msgstr "Data di pubblicazione da"
 msgid "Published Date To"
 msgstr "Data di pubblicazione fino a"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Escludi categorie"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Escludi serie"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Escludi lingue"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Estensioni"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Escludi estensioni"
 
@@ -2608,18 +2657,22 @@ msgid "Delete this Shelf"
 msgstr "Cancella questo scaffale"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Modifica lo scaffale"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Cambia ordine"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Lo scaffale verrà eliminato per tutti gli utenti"
 
@@ -2631,6 +2684,10 @@ msgstr "Condividi con tutti"
 msgid "Drag to Rearrange Order"
 msgstr "Trascina per riordinare"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Libro nascosto"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Statistiche della libreria"
@@ -2653,7 +2710,7 @@ msgstr "Serie in questa libreria"
 
 #: cps/templates/stats.html:29
 msgid "System Statistics"
-msgstr ""
+msgstr "Statistiche del sistema"
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
@@ -2731,15 +2788,11 @@ msgstr "Crea/Visualizza"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Aggiungi valori personali permessi/negati nelle colonne"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Elimina questo utente"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Genera un URL di autenticazione per Kobo"
 
-#: 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 176d7694..53dc3071 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 b01c009c..3bae28a4 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -30,276 +30,313 @@ msgstr "インストールされていません"
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました。ページを再読み込みしてください"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンしています。ページを閉じてください"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "不明"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "不明なエラーが発生しました。"
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "テストメールが %(kindlemail)s に送信されました"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr ""
@@ -308,98 +345,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません"
 
-#: cps/editbooks.py:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/editbooks.py:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
@@ -408,457 +445,470 @@ msgstr "この本の変換中にエラーが発生しました: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Googleドライブの設定が完了していません。Googleドライブを無効化してから再度有効にしてみてください"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
 
-#: cps/helper.py:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Googleドライブ: %(fn)s に %(format)s はありません"
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s がありません: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web テストメール"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "テストメール"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Webを始める"
 
-#: cps/helper.py:136
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "ユーザ: %(name)s 用の登録メール"
 
-#: cps/helper.py:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "メール: %(book)s"
 
-#: cps/helper.py:235
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
 
-#: cps/helper.py:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "待機中"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "開始"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "終了"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "不明"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "ログイン"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "トークンが見つかりません"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "トークンが無効です"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "成功です！端末に戻ってください"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "最近追加した本"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "最近追加された本を表示"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "人気の本"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr ""
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr ""
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr ""
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "読んだ本"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "既読の本と未読の本を表示"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "未読の本"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr ""
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "見つける"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "ランダムで本を表示"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "カテゴリ"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "カテゴリ選択を表示"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "シリーズ"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "シリーズ選択を表示"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "著者"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "著者選択を表示"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "出版社"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "出版社選択を表示"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "言語"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "言語選択を表示"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr ""
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr ""
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "指定された本棚は無効です"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, 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
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "この本は %(shelfname)s にすでに追加されています"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "本を %(sname)s に追加しました"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "%(name)s に本を追加することが許可されていません"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "これらの本は %(name)s にすでに追加されています"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "本が %(sname)s に追加されました"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "%(sname)s に本を追加できません"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "本が %(sname)s から削除されました"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, 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
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s を作成しました"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "エラーが発生しました"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "本棚を作成する"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s を変更しました"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 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
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "最近追加した本"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "本棚: '%(name)s'"
 
-#: 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:683
-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:944
-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:947
-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:1248
-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:1152 cps/web.py:1162
-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:1131
-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:1227
-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:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -889,254 +939,222 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "詳細検索"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "検索"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr "このユーザ名またはメールアドレスはすでに使われています。"
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "ログイン"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "トークンが見つかりません"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "トークンが無効です"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "成功です！端末に戻ってください"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter が失敗しました: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1179,7 +1197,6 @@ 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 "ダウンロード"
 
@@ -1192,9 +1209,8 @@ 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "削除"
 
@@ -1234,10 +1250,6 @@ msgstr ""
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr ""
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "設定"
@@ -1246,7 +1258,7 @@ msgstr "設定"
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "ログレベル"
 
@@ -1286,6 +1298,10 @@ msgstr ""
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
@@ -1343,16 +1359,17 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr ""
 
@@ -1372,44 +1389,44 @@ msgstr "経由"
 msgid "In Library"
 msgstr "ライブラリ内"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "減らす"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr ""
 
@@ -1445,13 +1462,13 @@ msgstr "本を変換"
 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
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 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
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "詳細"
 
@@ -1459,15 +1476,15 @@ msgstr "詳細"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1475,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "タグ"
 
@@ -1499,8 +1516,8 @@ msgstr ""
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "出版社"
@@ -1510,11 +1527,13 @@ msgstr "出版社"
 msgid "Language"
 msgstr "言語"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "はい"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "いいえ"
 
@@ -1526,47 +1545,48 @@ msgstr ""
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "キーワード"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "キーワードを検索"
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "カバー画像をクリックしてメタデータをフォームに読み込んでください"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "閉じる"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "ソース"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "検索エラー"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "検索結果が見つかりません。別のキーワードで検索してみてください。"
 
@@ -1671,303 +1691,307 @@ msgstr "ライブラリ設定"
 msgid "Location of Calibre Database"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Googleドライブを利用しますか？"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Googleドライブ設定の問題"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Googleドライブを認証"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "決定を押して設定を続けてください"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "ログイン後にGoogleドライブの設定を完了してください"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Googleドライブ上のCalibreフォルダ"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr ""
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "取り消す"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "サーバ設定"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "ポート"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL証明書の場所 (非SSLサーバでは空欄にしてください)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL鍵ファイルの場所 (非SSLサーバでは空欄にしてください)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr ""
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "安定"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "最新"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "ログファイルの設定"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "ログファイル名 (空欄の場合はcalibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr ""
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "機能設定"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr ""
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr ""
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "GoodreadsのAPIキー"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "GoodreadsのAPIシークレット"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "なし"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
-#, python-format
-msgid "Obtain %(provider)s OAuth Credential"
-msgstr ""
-
-#: cps/templates/config_edit.html:357
-#, python-format
-msgid "%(provider)s OAuth Client Id"
-msgstr ""
-
 #: cps/templates/config_edit.html:361
 #, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:364
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:368
+#, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "外部バイナリ"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrarバイナリのパス"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "ログイン"
@@ -2166,10 +2190,6 @@ msgstr "ドメイン名を入力"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/email_edit.html:99
-msgid "Are you sure you want to delete this domain?"
-msgstr ""
-
 #: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "次"
@@ -2190,19 +2210,21 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2274,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "ホーム"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "戻る"
 
@@ -2304,7 +2325,7 @@ msgstr "ログアウト"
 msgid "Register"
 msgstr "登録"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -2328,11 +2349,11 @@ msgstr "前"
 msgid "Book Details"
 msgstr "本の詳細"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "エラー"
 
@@ -2416,6 +2437,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2576,23 +2621,27 @@ msgstr ""
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "タグを除外"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "シリーズを除外"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "言語を除外"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
@@ -2609,18 +2658,22 @@ 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?"
+msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
+
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr ""
 
@@ -2632,6 +2685,10 @@ msgstr ""
 msgid "Drag to Rearrange Order"
 msgstr ""
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr ""
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr ""
@@ -2732,15 +2789,11 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: 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 4ea20a05..da7f3c16 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 7ebb1e09..9c31f0f8 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -31,276 +31,313 @@ msgstr "មិនបានតម្លើង"
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr ""
@@ -309,98 +346,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
 
-#: cps/editbooks.py:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/editbooks.py:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -409,457 +446,470 @@ msgstr ""
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr ""
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:136
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "អ៊ីមែល៖ %(book)s"
 
-#: cps/helper.py:235
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
 
-#: cps/helper.py:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "ចូលប្រើ"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "រកមិនឃើញវត្ថុតាង"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "វត្ថុតាងហួសពេលកំណត់"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "ទើបបន្ថែមថ្មីៗ"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "បង្ហាញសៀវភៅមកថ្មី"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "សៀវភៅដែលមានប្រជាប្រិយភាព"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "បង្ហាញសៀវភៅដែលមានប្រជាប្រិយភាព"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "សៀវភៅដែលបានអានរួច"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "សៀវភៅដែលមិនទាន់បានអាន"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr ""
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "ស្រាវជ្រាវ"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "បង្ហាញសៀវភៅចៃដន្យ"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "ប្រភេទនានា"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "បង្ហាញជម្រើសប្រភេទ"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "ស៊េរី"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "បង្ហាញជម្រើសស៊េរី"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "អ្នកនិពន្ធ"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr ""
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr ""
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "ភាសានានា"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "បង្ហាញផ្នែកភាសា"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr ""
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr ""
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "សៀវភៅត្រូវបានបន្ថែមទៅធ្នើ៖ %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, 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
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 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
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "ទើបបន្ថែមថ្មីៗ"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: 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:683
-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:944
-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:947
-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:1248
-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:1152 cps/web.py:1162
-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:1131
-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:1227
-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:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -890,254 +940,222 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "ចូលប្រើ"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "រកមិនឃើញវត្ថុតាង"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "វត្ថុតាងហួសពេលកំណត់"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1180,7 +1198,6 @@ 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 "ទាញយក"
 
@@ -1193,9 +1210,8 @@ 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "លុប"
 
@@ -1235,10 +1251,6 @@ msgstr "អ្នកចូលប្រើ SMTP"
 msgid "From E-mail"
 msgstr "ពីអ៊ីមែល"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr ""
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "ការកំណត់"
@@ -1247,7 +1259,7 @@ msgstr "ការកំណត់"
 msgid "Calibre Database Directory"
 msgstr "ទីតាំង database Calibre"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr ""
 
@@ -1287,6 +1299,10 @@ msgstr ""
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
@@ -1344,16 +1360,17 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "បាទ/ចាស"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr ""
 
@@ -1373,44 +1390,44 @@ msgstr "តាមរយៈ"
 msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "បន្ថែមទៀតដោយ"
 
@@ -1446,13 +1463,13 @@ msgstr ""
 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
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 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
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "ពិពណ៌នា"
 
@@ -1460,15 +1477,15 @@ msgstr "ពិពណ៌នា"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1476,7 +1493,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Tag"
 
@@ -1500,8 +1517,8 @@ msgstr ""
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "អ្នកបោះពុម្ភ"
@@ -1511,11 +1528,13 @@ msgstr "អ្នកបោះពុម្ភ"
 msgid "Language"
 msgstr "ភាសា"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "ទេ"
 
@@ -1527,47 +1546,48 @@ msgstr "ទម្រង់អាប់ឡូដ"
 msgid "View Book on Save"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "ពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "បិទ"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "ប្រភព"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "ការស្វែងរកមានកំហុស!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1672,303 +1692,307 @@ msgstr "ការកំណត់បណ្ណាល័យ"
 msgid "Location of Calibre Database"
 msgstr "ទីតាំង database របស់ Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "ប្រើ Google Drive ឬ?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "មានបញ្ហាកំណត់ប្រើជាមួយ Google Drive"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "វាយបញ្ចូលគណនី Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr ""
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "សូមបញ្ចប់ការភ្ជាប់ទៅ Google Drive ក្រោយពេល login"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Folder របស់ Google Drive Calibre"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "ដកសិទ្ធិ"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "ការកំណត់ម៉ាស៊ីន server"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "លេខ port របស់ម៉ាស៊ីន server"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "ទីតាំង SSL certfile (ទុកទទេសម្រាប់ម៉ាស៊ីន server ដែលមិនប្រើ SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "ទីតាំង SSL keyfile (ទុកទទេសម្រាប់ម៉ាស៊ីន server ដែលមិនប្រើ SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr ""
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr ""
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr ""
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "ការកំណត់ logfile"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "ទីតាំង និងឈ្មោះ logfile (calibre-web.log ប្រសិនបើទទេ)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr ""
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr ""
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "អនុញ្ញាតការរុករកដោយអនាមិក"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "អនុញ្ញាតការចុះឈ្មោះសាធារណៈ"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "អនុញ្ញាតការ login ពីចម្ងាយ (ឬ “magic link”)"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr ""
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "ទាញយក API key"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API key"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API secret"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "គ្មាន"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
-#, python-format
-msgid "Obtain %(provider)s OAuth Credential"
-msgstr ""
-
-#: cps/templates/config_edit.html:357
-#, python-format
-msgid "%(provider)s OAuth Client Id"
-msgstr ""
-
 #: cps/templates/config_edit.html:361
 #, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:364
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:368
+#, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
@@ -2167,10 +2191,6 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/email_edit.html:99
-msgid "Are you sure you want to delete this domain?"
-msgstr ""
-
 #: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "បន្ទាប់"
@@ -2191,19 +2211,21 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2275,8 +2297,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "មកក្រោយ"
 
@@ -2305,7 +2326,7 @@ msgstr "ចេញពីការប្រើប្រាស់"
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
@@ -2329,11 +2350,11 @@ msgstr "មុន"
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr ""
 
@@ -2417,6 +2438,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2577,23 +2622,27 @@ msgstr "ថ្ងៃបោះពុម្ភចាប់ពី"
 msgid "Published Date To"
 msgstr "ថ្ងៃបោះពុម្ភរហូតដល់"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "លើកលែង tag"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "លើកលែងស៊េរី"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "លើកលែងភាសា"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
@@ -2610,18 +2659,22 @@ msgid "Delete this Shelf"
 msgstr "លុបធ្នើនេះ"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
+msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "ប្តូរលំដាប់"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: cps/templates/shelf.html:75
-msgid "Are you sure you want to delete this shelf?"
-msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "ធ្នើនេះនឹងបាត់បង់ជាអចិន្ត្រៃយ៍សម្រាប់គ្រប់គ្នា!"
 
@@ -2633,6 +2686,10 @@ msgstr "តើធ្នើនេះគួរជាសាធារណៈទេ?"
 msgid "Drag to Rearrange Order"
 msgstr "ទាញដើម្បីប្តូរលំដាប់"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr ""
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "ស្ថិតិបណ្ណាល័យ Calibre"
@@ -2733,15 +2790,11 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "លុបអ្នកប្រើប្រាស់នេះ"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: 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 2979fbba..14525246 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 36b374dc..a1aef60f 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -31,276 +31,313 @@ msgstr "niet geïnstalleerd"
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "De server is herstart, vernieuw de pagina"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met afsluiten van de server, sluit het venster"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Opnieuw verbinden gelukt"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Systeembeheer"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Wil je werkelijk je Kobo Token verwijderen?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json is niet geconfigureerd voor webapplicatie"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "De locatie van het logbestand is onjuist, voer een geldige locatie in"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "De locatie vam het toegangslog is onjuist, voer een geldige locatie in"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-sleutellocatie is niet geldig, voer een geldige locatie in"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldige locatie in"
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr "Instellingen niet opgeslagen"
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Database niet gevonden, voer de juiste locatie in"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "Kan niet schrijven naar database"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-mail verstuurd naar %(kindlemail)s"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Fout: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Fout: No user returned in response of LDAP server"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "niet geconfigureerd"
@@ -309,98 +346,98 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Het boekformaat is verwijderd"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identificatoren zijn niet hoofdlettergevoelig, overschrijf huidige identificatoren"
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken, controleer het logbestand"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Omslag %(file)s niet verplaatst: %(error)s"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +446,470 @@ msgstr "Er is een fout opgetreden bij het converteren van dit boek: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Het instellen van Google Drive is niet afgerond, heractiveer Google Drive"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s niet gevonden %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web - test-e-mail"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Test-e-mail"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Aan de slag met Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: 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:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Fout bij downloaden omslag"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Onjuist omslag formaat"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Locatie aanmaken voor omslag mislukt"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 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:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Alleen jpg/jpeg bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Wachten"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Kobo Instellen"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Inloggen bij GitHub mislukt."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Opvragen gebruikersinfo bij GitHub mislukt."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Inloggen bij Google mislukt."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr "Opvragen gebruikersinfo bij Google mislukt."
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Koppeling gemaakt met %(oauth)s"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Inloggen mislukt, geen gebruiker gekoppeld aan OAuth account"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Koppeling met %(oauth)s verbroken"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Ontkoppelen van %(oauth)s mislukt"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub OAuth fout, probeer het later nog eens."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google OAuth fout, probeer het later nog eens."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "inloggen"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Toegangssleutel niet gevonden"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Toegangssleutel is verlopen"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Gelukt! Ga terug naar je apparaat"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Recent toegevoegd"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Recent toegevoegde boeken tonen"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Populaire boeken"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Populaire boeken tonen"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr "Gedownloade boeken"
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr "Gedownloade boeken tonen"
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Best beoordeelde boeken"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Best beoordeelde boeken tonen"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Gelezen boeken"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Gelezen/Ongelezen boeken tonen"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Ongelezen boeken"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Ongelezen boeken tonen"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Willekeurige boeken"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Willekeurige boeken tonen"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Categorieën"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Categoriekeuze tonen"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Boekenreeksen"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Boekenreeksenkeuze tonen"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Auteurs"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Auteurkeuze tonen"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Uitgevers"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Uitgeverskeuze tonen"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Talen"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Taalkeuze tonen"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Beoordelingen"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Beoordelingen tonen"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Bestandsformaten"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Bestandsformaten tonen"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Gearchiveerde boeken"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Gearchiveerde boeken tonen"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr "Boekenlijst"
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr "Boekenlijst tonen"
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Ongeldige boekenplank opgegeven"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Sorry, je mag geen boeken toevoegen aan boekenplank: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Dit boek maakt al deel uit van boekenplank: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Het boek is toegevoegd aan boekenplank: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Je bent niet gemachtigd om boeken toe te voegen aan boekenplank: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Deze boeken maken al deel uit van boekenplank: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "De boeken zijn toegevoegd aan boekenplank: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Kan boeken niet toevoegen aan boekenplank: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Je bent niet gemachtigd om boeken te verwijderen van boekenplank: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Een openbare boekenplank met de naam '%(title)s' bestaat al."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Een persoonlijke boekenplank met de naam '%(title)s' bestaat al."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' aangemaakt"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Boekenplank maken"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Pas een boekenplank aan"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Boekenplank: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Verborgen boek"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde bewerken van boekenplank: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Recent toegevoegd"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Boekenplank: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Recent toegevoegde boeken tonen"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Populaire boeken"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Populaire boeken tonen"
-
-#: cps/ub.py:74
-msgid "Downloaded Books"
-msgstr "Gedownloade boeken"
-
-#: cps/ub.py:76
-msgid "Show Downloaded Books"
-msgstr "Gedownloade boeken tonen"
-
-#: cps/templates/index.xml:24 cps/ub.py:79 cps/web.py:683
-msgid "Top Rated Books"
-msgstr "Best beoordeelde boeken"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Gelezen boeken"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Ongelezen boeken"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Ongelezen boeken tonen"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Willekeurige boeken"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Willekeurige boeken tonen"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Categorieën"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Categoriekeuze tonen"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Boekenreeksen"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Boekenreeksenkeuze tonen"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Auteurs"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Auteurkeuze tonen"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Uitgevers"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Uitgeverskeuze tonen"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Talen"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Taalkeuze tonen"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Beoordelingen"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Beoordelingen tonen"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Bestandsformaten"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Bestandsformaten tonen"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr "Gearchiveerde boeken"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Gearchiveerde boeken tonen"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr "Boekenlijst"
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr "Boekenlijst tonen"
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -890,254 +940,222 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Fout: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Fout: No user returned in response of LDAP server"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Boeken"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Gedownloade boeken door %(user)s"
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "registreren"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 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:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr "Gebruikersnaam of e-mailadres is al in gebruik."
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "inloggen"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Toegangssleutel niet gevonden"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Toegangssleutel is verlopen"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Gelukt! Ga terug naar je apparaat"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-boek-conversie mislukt: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1180,7 +1198,6 @@ 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:70
 msgid "Download"
 msgstr "Downloaden"
 
@@ -1193,9 +1210,8 @@ msgid "Edit"
 msgstr "Bewerken"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1235,10 +1251,6 @@ msgstr "SMTP-gebruikersnaam"
 msgid "From E-mail"
 msgstr "Van e-mail"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Bewerk basis configuratie"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Instellingen"
@@ -1247,7 +1259,7 @@ msgstr "Instellingen"
 msgid "Calibre Database Directory"
 msgstr "Calibre-database locatie"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Logniveau"
 
@@ -1287,6 +1299,10 @@ msgstr "Reverse Proxy Login"
 msgid "Reverse proxy header name"
 msgstr "Reverse proxy header naam"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Bewerk basis configuratie"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Bewerk gebruikersinterface configuratie"
@@ -1344,16 +1360,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Oké"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1373,44 +1390,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "In bibliotheek"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr "Sorteren op datum, nieuwste boeken eerst"
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr "Sorteren op datum, oudste boeken eerst"
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr "Sorteren op alfabetische volgorde"
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sorteren op omgekeerde alfabetische volgorde"
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr "Sorteren op publicatiedatum, nieuwste boeken eerst"
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sorteren op publicatiedatum, oudste boeken eerst"
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "beperken"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Meer van"
 
@@ -1446,13 +1463,13 @@ msgstr "Boek converteren"
 msgid "Book Title"
 msgstr "Boektitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -1460,15 +1477,15 @@ msgstr "Omschrijving"
 msgid "Identifiers"
 msgstr "Identificatoren"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "Identificatie type"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "Identificatie waarde"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1476,7 +1493,7 @@ msgstr "Verwijderen"
 msgid "Add Identifier"
 msgstr "Identificator toevoegen"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Labels"
 
@@ -1500,8 +1517,8 @@ msgstr "Omslag uploaden vanaf de harde schijf"
 msgid "Published Date"
 msgstr "Publicatiedatum"
 
-#: 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Uitgever"
@@ -1511,11 +1528,13 @@ msgstr "Uitgever"
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nee"
 
@@ -1527,47 +1546,48 @@ msgstr "Uploadformaat"
 msgid "View Book on Save"
 msgstr "Boek inkijken na bewerking"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Opslaan"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Trefwoord"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Trefwoord zoeken "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Sluiten"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Zoekfout!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Geen resultaten gevonden! Gebruik een ander trefwoord."
 
@@ -1672,303 +1692,307 @@ msgstr "Bibliotheekinstellingen"
 msgid "Location of Calibre Database"
 msgstr "Locatie van de Calibre-database"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Google Drive gebruiken?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive-instelprobleem"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Google Drive goedkeuren"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Druk op 'Opslaan' om door te gaan met instellen"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Voltooi na inloggen de Google Drive-instelwizard"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre-map"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metagegevens Watch Channel ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Intrekken"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Serverinstellingen"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Serverpoort"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL-certificaatlocatie ('certfile' - laat leeg voor niet-SSL-servers)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL-sleutellocatie ('keyfile' - laat leeg voor niet-SSL-servers)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Updatekanaal"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Stabiel"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Bèta"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Logbestanden"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Locatie en naam van logbestand (calibre-web.log indien niet opgegeven)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Toegangslog aanzetten"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Locatie en naam van het toegangslog (access.log indien niet opgegeven)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Geavanceerde opties"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Uploaden inschakelen"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Toegelaten upload formaten"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Anoniem verkennen inschakelen"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Openbare registratie inschakelen"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Gebruik e-mail als inlognaam"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Inloggen op afstand inschakelen ('magic link')"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Zet Kobo sync aan"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Proxy onbekende verzoeken naar Kobo winkel"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Gebruik Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "API-sleutel verkrijgen"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API-sleutel"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API-geheim"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Reverse Proxy authenticatie toestaan"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Reverse proxy header naam"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Login type"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Gebruik standaard authenticatie"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Gebruik LDAP authenticatie"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Gebruik OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP Server hostnaam of IP-adres"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "LDAP Server Poort"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "LDAP encryptie"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Geen"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP Authenticatie"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Niet geverifieerd"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Eenvoudig"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP Administrator naam"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP Administrator wachtwoord"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP Server is OpenLDAP?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP groepnaam"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP groepleden veld"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr "Automatisch detecteren"
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Verkrijg %(provider)s OAuth Verificatiegegevens"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client geheim"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externe programma's"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Locatie van Unrar-programma"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Inloggen"
@@ -2167,10 +2191,6 @@ msgstr "Voer domeinnaam in"
 msgid "Denied Domains (Blacklist)"
 msgstr "Geweigerde domeinen voor registratie"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Volgende"
@@ -2191,19 +2211,21 @@ msgstr "Probleem melden"
 msgid "Return to Home"
 msgstr "Terug naar startpagina"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr "Auteurs sorteren op alfabetische volgorde"
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Auteurs sorteren op omgekeerde alfabetische volgorde"
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2275,8 +2297,7 @@ msgstr "Boeken onderdeel van boekenplanken"
 msgid "Home"
 msgstr "Startpagina"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Annuleren"
 
@@ -2305,7 +2326,7 @@ msgstr "Afmelden"
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
@@ -2329,11 +2350,11 @@ msgstr "Vorige"
 msgid "Book Details"
 msgstr "Boekgegevens"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Fout"
 
@@ -2417,6 +2438,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web - e-boekcatalogus"
@@ -2577,23 +2622,27 @@ msgstr "Publicatiedatum van"
 msgid "Published Date To"
 msgstr "Publicatiedatum tot"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Labels uitsluiten"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Boekenreeksen uitsluiten"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Talen uitsluiten"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Extenties"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Extenties uitsluiten"
 
@@ -2610,18 +2659,22 @@ msgid "Delete this Shelf"
 msgstr "Boekenplank verwijderen"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Boekenplank bewerken"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Volgorde aanpassen"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Boekenplank wordt permanent verwijderd voor iedereen"
 
@@ -2633,6 +2686,10 @@ msgstr "Zichtbaar voor iedereen"
 msgid "Drag to Rearrange Order"
 msgstr "Pas de volgorde aan middels slepen-en-neerzetten"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Verborgen boek"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Calibre bibliotheekstatistieken"
@@ -2733,15 +2790,11 @@ msgstr "Aanmaken/Bekijk"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Voeg toegestane/geweigerde aangepaste kolom waarden toe"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Deze gebruiker verwijderen"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Genereer Kobo Auth URL"
 
-#: 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 07008d7e..5abeff00 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 e63f495b..b7ac7801 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+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"
@@ -31,279 +31,316 @@ msgstr "nie zainstalowane"
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Ponowne połączenie zakończono sukcesem"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Panel administratora"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Czy na pewno chcesz usunąć Token Kobo?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Czy na pewno chcesz usunąć półkę?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json nie został skonfigurowany dla aplikacji webowej"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika dostępu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Wprowadź dostawcę LDAP, port, nazwę wyróżniającą i identyfikator obiektu użytkownika"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr obiektów grupy LDAP musi mieć jeden identyfikator formatu \"% s\""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr obiektów użytkownika LDAP musi mieć jeden identyfikator formatu \"% s\""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr "Baza danych ustawień nie jest zapisywalna"
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "Baza danych nie jest zapisywalna"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Konfiguracja podstawowa"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub pseudonimu."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Nie można usunąć użytkownika. Brak na serwerze innego konta z prawami administratora"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 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:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, 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:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
 # ???
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 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:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Błąd: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "Przynajmniej jeden użytkownik LDAP nie został znaleziony w bazie danych"
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "nie skonfigurowane"
@@ -312,98 +349,98 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "Plik książki w wybranym formacie został usunięty"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s nie jest prawidłowym językiem"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do wysłania musi mieć rozszerzenie"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, 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:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Format pliku %(ext)s dodany do %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, 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:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
@@ -412,460 +449,473 @@ msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Konfiguracja Google Drive nie została zakończona, spróbuj dezaktywować i ponownie aktywować Google Drive"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nie znaleziono: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Testowy e-mail Calibre-Web"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Testowy e-mail"
 
 # ???
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Zacznij korzystać z Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-mail: %(book)s"
 
 # ???
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: 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:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "Błąd przy pobieraniu okładki"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "Błędny format okładki"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Nie udało się utworzyć ścieżki dla okładki"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 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:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Nieudane"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Rozpoczynanie"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Zakończone"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Konfiguracja Kobo"
 
 # ???
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Nie udało się zalogować za pomocą GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Nie udało się pobrać informacji o użytkowniku z GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Nie udało się zalogować do Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 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:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Łączenie z %(oauth)s zakończono sukcesem"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Błąd logowania, użytkownik niepołączony z kontem OAuth"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Rozłączanie z %(oauth)s zakończono sukcesem"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Rozłączanie z %(oauth)s zakończono porażką"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "Błąd GitHub Oauth, proszę spróbować później."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Błąd Google Oauth, proszę spróbować później."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "logowanie"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Nie znaleziono tokenu"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Token wygasł"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Powodzenie! Wróć do swojego urządzenia"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Ostatnio dodane"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Pokaż menu ostatnio dodanych książek"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Najpopularniejsze"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Pokaż menu najpopularniejszych książek"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Najwyżej ocenione"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Pokaż menu najwyżej ocenionych książek"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Przeczytane"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Pokaż menu przeczytane i nieprzeczytane"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Nieprzeczytane"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Pokaż nieprzeczytane"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Odkrywaj"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Pokaż menu losowych książek"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Kategorie"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Pokaż menu wyboru kategorii"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Cykle"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Pokaż menu wyboru cyklu"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Autorzy"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Pokaż menu wyboru autora"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Wydawcy"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Pokaż menu wyboru wydawcy"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Języki"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Pokaż menu wyboru języka"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Oceny"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Pokaż menu listy ocen"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Formaty plików"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Pokaż menu formatu plików"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "Zarchiwizowane książki"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "Pokaż zarchiwizowane książki"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Podano niewłaściwą półkę"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Niestety, nie posiadasz uprawnień do dodania książki do półki: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Książka jest już dodana do półki: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Książka została dodana do półki: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Nie masz uprawnień do dodania ksiażki do półki: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Książki są już dodane do półki: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Książki zostały dodane do półki %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Nie można dodać książek do półki: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Książka została usunięta z półki: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Niestety nie możesz usunąć książki z tej półki %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Publiczna półka o nazwie '%(title)s' już istnieje."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Prywatna półka o nazwie '%(title)s' już istnieje."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Półka: „%(name)s”"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Ukryta książka"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Ostatnio dodane"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Półka: „%(name)s”"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Pokaż menu ostatnio dodanych książek"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Najpopularniejsze"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Pokaż menu najpopularniejszych książek"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Najwyżej ocenione"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Przeczytane"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Nieprzeczytane"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Pokaż nieprzeczytane"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Odkrywaj"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Pokaż menu losowych książek"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Kategorie"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Pokaż menu wyboru kategorii"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Cykle"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Pokaż menu wyboru cyklu"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Autorzy"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Pokaż menu wyboru autora"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Wydawcy"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Pokaż menu wyboru wydawcy"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Języki"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Pokaż menu wyboru języka"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Oceny"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Pokaż menu listy ocen"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Formaty plików"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Pokaż menu formatu plików"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr "Zarchiwizowane książki"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "Pokaż zarchiwizowane książki"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -896,254 +946,222 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Błąd: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
-
-#: cps/web.py:392
-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:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Książki"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, 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/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 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:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, 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:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 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:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "logowanie"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Nie znaleziono tokenu"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Token wygasł"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Powodzenie! Wróć do swojego urządzenia"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Nie znaleziono narzędzia calibre %(tool)s do konwertowania"
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter spowodowało błąd: %(error)s"
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, 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
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Konwertowanie nie powiodło się: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1188,7 +1206,6 @@ 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:70
 msgid "Download"
 msgstr "Pobieranie"
 
@@ -1202,9 +1219,8 @@ msgstr "Edycja"
 
 # ???
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1244,10 +1260,6 @@ msgstr "Nazwa użytkownika SMTP"
 msgid "From E-mail"
 msgstr "Wyślij z adresu e-mail"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Edytuj podstawową konfigurację"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguracja"
@@ -1256,7 +1268,7 @@ msgstr "Konfiguracja"
 msgid "Calibre Database Directory"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Poziom dziennika"
 
@@ -1296,6 +1308,10 @@ msgstr "Logowanie reverse proxy"
 msgid "Reverse proxy header name"
 msgstr "Nazwa nagłówka reverse proxy"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Edytuj podstawową konfigurację"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Edytuj konfigurację interfejsu"
@@ -1353,16 +1369,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1382,44 +1399,44 @@ msgstr "przez"
 msgid "In Library"
 msgstr "W Bibliotece"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "zwiń"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Więcej według"
 
@@ -1456,13 +1473,13 @@ msgstr "Konwertuj książkę"
 msgid "Book Title"
 msgstr "Tytuł książki"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Opis"
 
@@ -1470,15 +1487,15 @@ msgstr "Opis"
 msgid "Identifiers"
 msgstr "Identyfikatory"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "Rodzaj identyfikatora"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "Wartość identyfikatora"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1486,7 +1503,7 @@ msgstr "Usuń"
 msgid "Add Identifier"
 msgstr "Dodaj identyfikator"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Etykiety"
 
@@ -1510,8 +1527,8 @@ 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:259
-#: cps/templates/book_edit.html:276 cps/templates/detail.html:156
+#: cps/templates/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Wydawca"
@@ -1521,11 +1538,13 @@ msgstr "Wydawca"
 msgid "Language"
 msgstr "Język"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Tak"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nie"
 
@@ -1537,47 +1556,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Zapisz"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Zamknij"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Źródło"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Nie znaleziono! Spróbuj użyć innego słowa kluczowego."
 
@@ -1682,304 +1702,308 @@ msgstr "Konfiguracja biblioteki"
 msgid "Location of Calibre Database"
 msgstr "Lokalizacja bazy danych Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Użyć dysku Google?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Problem z konfiguracją Dysku Google"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Uwierzytelnij Dysk Google"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Kliknij przycisk, aby kontynuować instalację"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Proszę zakończyć konfigurowanie Google Drive po zalogowaniu"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Folder Calibre na Google Drive"
 
 # ???
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadane Watch Channel ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Unieważnij"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Port serwera"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Lokalizacja certyfikatu SSL (pozostaw puste jeśli bez SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Lokalizacja klucza SSL (pozostaw puste jeśli bez SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Kanał aktualizacji"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Wersje stabilne"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Wydania nocne"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Konfiguracja dziennika"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Lokalizacja i nazwa pliku dziennika (domyślnie calibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Włącz dziennik dostępu (access log)"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Lokalizacja i nazwa pliku dziennika dostepu (domyślnie access.log)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Konfiguracja funkcjonalności"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Włącz wysyłanie"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "Dozwolone formaty przesyłania"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Włącz anonimowe przeglądanie"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Włącz publiczną rejestrację"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "Użyj e-maila jako nazwy użytkownika"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Włącz zdalne logowanie („Magic Link”)"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Włącz synchronizację Kobo"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Nieznane żądania proxy do Kobo Store"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Użyj Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Uzyskaj klucz API"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Klucz API Goodreads"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Zezwalaj na uwierzytelnianie reverse proxy"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Nazwa nagłowka reverse proxy"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Rodzaj logowania"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Użyj standardowego uwierzytelnienia"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Użyj uwierzytelniania LDAP"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Uzyj OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Nazwa hosta lub adres IP serwera LDAP"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "Port serwera LDAP"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "Szyfrowanie LDAP"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Brak"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Uwierzytelnianie LDAP"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Nieuwierzytelniony"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Proste"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Nazwa administratora LDAP"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Hasło administratora LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Serwer LDAP to OpenLDAP?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "Następujące ustawienia są niezbędne dla zaimportowania użytkowników"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Filtr obiektów grupy LDAP"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Nazwa grupy LDAP"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Pola członków grupy LDAP"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Uzyskaj %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Zewnętrzne pliki"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Ścieżka do konwertera Calibre"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Ustawienia konwertera calibre"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "Ścieżka do konwertera Kepubify"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Lokalizacja pliku binarnego Unrar"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Zaloguj się"
@@ -2178,10 +2202,6 @@ msgstr "Podaj nazwę domeny"
 msgid "Denied Domains (Blacklist)"
 msgstr "Domeny zabronione (czarna lista)"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Następne"
@@ -2205,19 +2225,21 @@ msgstr "Zgłoś błąd"
 msgid "Return to Home"
 msgstr "Powrót do głównego menu"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2289,8 +2311,7 @@ msgstr "Książki ułożone na półkach"
 msgid "Home"
 msgstr "Główne menu"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Wróć"
 
@@ -2319,7 +2340,7 @@ msgstr "Wyloguj się"
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Wysyłanie…"
 
@@ -2344,12 +2365,12 @@ msgstr "Poprzedni"
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
 # ???
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Błąd"
 
@@ -2434,6 +2455,30 @@ msgstr "Ważne dla Kobo: usunięte książki pozostaną na każdym połączonym
 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/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Katalog e-booków Calibre-Web"
@@ -2594,23 +2639,27 @@ msgstr "Data publikacji od"
 msgid "Published Date To"
 msgstr "Data publikacji do"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Wyklucz etykiety"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Wyklucz cykle"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Wyklucz języki"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Wyklucz rozszerzenia"
 
@@ -2627,18 +2676,22 @@ msgid "Delete this Shelf"
 msgstr "Usuń tą półkę"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Edytuj półkę"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Zmień sortowanie"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Półka zostanie usunięta dla wszystkich użytkowników"
 
@@ -2650,6 +2703,10 @@ msgstr "Współdziel z wszystkimi"
 msgid "Drag to Rearrange Order"
 msgstr "Przeciągnij i upuść, aby zmienić kolejność"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Ukryta książka"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Statystyki biblioteki Calibre"
@@ -2752,15 +2809,11 @@ msgstr "Utwórz/Przeglądaj"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Dodaj dozwolone/zabronione wartości własnych kolumn"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Usuń tego użytkownika"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Generuj Kobo Auth URL"
 
-#: 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 9dae6beb..7367a756 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 91854f1e..925f384e 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -31,276 +31,313 @@ msgstr "не установлено"
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, обновите страницу"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "Успешно переподключено"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Вы действительно хотите удалить Kobo Token ?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Вы действительно хотите удалить эту книжную полку?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Тестовое письмо успешно отправлено на %(kindlemail)s"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "Ошибка: %(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "Не удалось создать хотя бы одного пользователя LDAP"
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "не настроено"
@@ -309,98 +346,98 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Ошибка при открытии eBook. Файл не существует или файл недоступен"
 
-#: cps/editbooks.py:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/editbooks.py:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Файл %(filename)s не удалось сохранить во временную папку"
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
@@ -409,457 +446,470 @@ msgstr "Произошла ошибка при конвертирования э
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Настройка Google Drive не завершена, попробуйте деактивировать и снова активировать Google Drive"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
 
-#: cps/helper.py:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s не найден на Google Drive: %(fn)s"
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s не найден: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Тестовый e-mail для Calibre-Web"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Тестовый e-mail"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Начать работу с Calibre-Web"
 
-#: cps/helper.py:136
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Регистрационный e-mail для пользователя: %(name)s"
 
-#: cps/helper.py:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "Эл. почта: %(book)s"
 
-#: cps/helper.py:235
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Запрашиваемый файл не может быть прочитан. Возможно у вас нет разрешения?"
 
-#: cps/helper.py:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Не удалось создать путь для обложки."
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
-msgstr "Только файлы jpg / jpeg / png / webp поддерживаются в качестве файла обложки"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Только файлы в формате jpg / jpeg поддерживаются как файл обложки"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Начало"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Завершено"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Настройка Kobo"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Не удалось войти в систему с помощью GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Не удалось получить информацию о пользователе из GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Не удалось войти в систему с помощью Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr "Не удалось получить информацию о пользователе из Google."
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Связь с %(oauth)s Успешна"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Не удалось войти, ни один пользователь не связан с учетной записью OAuth"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Отмена связи с %(oauth)s успешно"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Связь с %(oauth)s не удалось отмененить"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "Ошибка GitHub Oauth, пожалуйста попробуйте позже."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Ошибка Google Oauth, пожалуйста попробуйте позже."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "войти"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Ключ не найден"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Ключ просрочен"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Успешно! Пожалуйста, проверьте свое устройство"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Недавно Добавленные"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Показывать недавние книги"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Популярные Книги"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Показывать популярные книги"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Книги с наилучшим рейтингом"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Показывать книги с наивысшим рейтингом"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Прочитанные Книги"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Показывать прочитанные и непрочитанные"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Непрочитанные Книги"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Показать непрочитанное"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Обзор"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Показывать случайные книги"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Категории"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Показывать выбор категории"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Серии"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Показывать выбор серии"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Авторы"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Показывать выбор автора"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Издатели"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Показать выбор издателя"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Языки"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Показывать выбор языка"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Рейтинги"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Показать выбор рейтинга"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Форматы файлов"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Показать выбор форматов файлов"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Указана неверная полка"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, 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
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Книги уже размещены на полке: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Книга добавлена на книжную полку: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Вам не разрешено добавлять книгу на полку: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Книги уже размещены на полке: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Книги добавлены на полку: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Не удалось добавить книги на полку: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга удалена с полки: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, 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
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Публичная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Приватная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана полка %(title)s"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Создать полку"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Колка %(title)s изменена"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 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
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Недавно Добавленные"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Полка: '%(name)s'"
 
-#: 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:683
-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:944
-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:947
-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:1248
-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:1152 cps/web.py:1162
-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:1131
-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:1227
-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:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -890,254 +940,222 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Нажмите на кнопку ниже для обновления до последней стабильной версии."
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "Ошибка: %(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "Не удалось создать хотя бы одного пользователя LDAP"
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Книги"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "регистрация"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr "Этот никнейм или e-mail уже используются."
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "войти"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Ключ не найден"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Ключ просрочен"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Успешно! Пожалуйста, проверьте свое устройство"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Читать Книгу"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ошибка Ebook-конвертора: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1180,7 +1198,6 @@ 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 "Скачать"
 
@@ -1193,9 +1210,8 @@ 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1235,10 +1251,6 @@ msgstr "SMTP-логин"
 msgid "From E-mail"
 msgstr "Отправитель"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Изменить основные настройки"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Настройки сервера"
@@ -1247,7 +1259,7 @@ msgstr "Настройки сервера"
 msgid "Calibre Database Directory"
 msgstr "Расположение базы данных Calibre"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Уровень логирования"
 
@@ -1287,6 +1299,10 @@ msgstr "Логин обратного прокси"
 msgid "Reverse proxy header name"
 msgstr "Имя заголовка обратного прокси"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Изменить основные настройки"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Изменить настройки интерфейса"
@@ -1344,16 +1360,17 @@ msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1373,44 +1390,44 @@ msgstr "с помощью"
 msgid "In Library"
 msgstr "В библиотеке"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "уменьшить"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Ещё от"
 
@@ -1446,13 +1463,13 @@ msgstr "Конвертировать книгу"
 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
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 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
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Описание"
 
@@ -1460,15 +1477,15 @@ msgstr "Описание"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1476,7 +1493,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Теги"
 
@@ -1500,8 +1517,8 @@ msgstr "Загрузить обложку с диска"
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Издатель"
@@ -1511,11 +1528,13 @@ msgstr "Издатель"
 msgid "Language"
 msgstr "Язык"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Да"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Нет"
 
@@ -1527,47 +1546,48 @@ msgstr "Загружаемый формат"
 msgid "View Book on Save"
 msgstr "Просмотреть книгу после сохранения"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Сохранить"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Поиск по ключевому слову "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Закрыть"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Источник"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Ошибка поиска!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Результат(ы) не найдены! Попробуйте другое ключевое слово."
 
@@ -1672,303 +1692,307 @@ msgstr "Настройки библотеки"
 msgid "Location of Calibre Database"
 msgstr "Расположение базы данных Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Использовать Google Drive?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Проблема с настройкой Google Drive"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Аутентификация Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Пожалуйста, нажмите «Отправить», чтобы продолжить настройку"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Пожалуйста завершите настройку Google Диска после входа в систему"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Папка на Google Диске для Calibre"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "ID Канала Просмотра Метаданных"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Отозвано"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Настройки сервера"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Порт сервера"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Расположение SSL сертификата (оставьте его пустым для серверов без SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Расположение SSL файла-ключа (оставьте его пустым для серверов без SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Ветка обновлений"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Стабильная"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Тестовая"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Настройки лог-файла"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Расположение и имя лог-файла (не вводите calibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Включить журнал доступа"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Расположение и имя лог-файла доступа (access.log по умолчанию)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Разрешить загрузку на сервер"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Разрешить анонимный просмотр"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Разрешить публичную регистрацию"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Включить удаленный логин (\"magic link\")"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Включить Kobo sync"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Неизвестный прокси запрос к Kobo Store"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Использовать Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Получить ключ API"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Ключ API Goodreads"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Секрет"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Разрешить обратную аутентификацию прокси"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Имя заголовка обратного прокси"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Тип входа"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Использовать стандартную аутентификацию"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Использовать LDAP аутентификацию"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Использовать OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Имя хоста или IP-адрес сервера LDAP"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "Порт сервера LDAP"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "Шифрование LDAP"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Нет"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "Аутентификация LDAP"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "Анонимный"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "Неаутентифицированный"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "Простой"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "Имя администратора LDAP"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "Пароль администратора LDAP"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Отличительное имя LDAP (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "Фильтр объектов пользователя LDAP"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Сервер LDAP - это OpenLDAP ?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "Следующие настройки необходимы для импорта пользователем."
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "Фильтр объектов группы LDAP"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "Имя группы LDAP"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "Поле членов группы LDAP"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Получить %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth ID клиента"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Секрет клиента"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Конвертация"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Расположение бинарного файла Unrar"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Логин"
@@ -2167,10 +2191,6 @@ msgstr "Введите доменное имя"
 msgid "Denied Domains (Blacklist)"
 msgstr "Запрещенные домены (черный список)"
 
-#: cps/templates/email_edit.html:99
-msgid "Are you sure you want to delete this domain?"
-msgstr "Вы действительно желаете удалить это правило домена?"
-
 #: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далее"
@@ -2191,19 +2211,21 @@ msgstr "Создать запись"
 msgid "Return to Home"
 msgstr "Вернуться на главную"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2275,8 +2297,7 @@ msgstr "Книги организованы на полках"
 msgid "Home"
 msgstr "Главная"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Назад"
 
@@ -2305,7 +2326,7 @@ msgstr "Выход"
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Загружается..."
 
@@ -2329,11 +2350,11 @@ msgstr "Предыдущий"
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Ошибка"
 
@@ -2417,6 +2438,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Каталог электронных книг Caliber-Web"
@@ -2577,23 +2622,27 @@ msgstr "Опубликовано от"
 msgid "Published Date To"
 msgstr "Опубликовано до"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Исключить теги"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Исключить серии"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Исключить языки"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Расширения"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Исключить расширения"
 
@@ -2610,18 +2659,22 @@ msgid "Delete this Shelf"
 msgstr "Удалить эту книжную полку"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Изменить Полку"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Изменить порядок"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: cps/templates/shelf.html:75
-msgid "Are you sure you want to delete this shelf?"
-msgstr "Вы действительно хотите удалить эту книжную полку?"
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Книжная полка будет безвозвратно удалена для всех"
 
@@ -2633,6 +2686,10 @@ msgstr "Сделать книжную полку доступной для вс
 msgid "Drag to Rearrange Order"
 msgstr "Перетащите для изменения порядка"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Скрытая книга"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Статистика библиотеки Calibre"
@@ -2733,15 +2790,11 @@ msgstr "Создать/Просмотреть"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Добавить разрешенные / запрещенные значения индивидуальных столбцов"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Удалить этого пользователя"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 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 Token ?"
-
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index e7b3d480..6cb8363f 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 486af3c1..3d290303 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+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"
@@ -30,276 +30,313 @@ msgstr "inte installerad"
 msgid "Statistics"
 msgstr "Statistik"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Server startas om, vänligen uppdatera sidan"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Okänd"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Administrationssida"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Vill du verkligen ta bort Kobo-token?"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Är du säker på att du vill ta bort hyllan?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller smeknamnet."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 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:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Ett okänt fel uppstod."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-post skicka till %(kindlemail)s"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "inte konfigurerad"
@@ -308,98 +345,98 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, 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:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, 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:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +445,470 @@ msgstr "Det gick inte att konvertera den här boken: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Installationen av Google Drive är inte klar, försök att inaktivera och aktivera Google Drive igen"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s hittades inte: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web test e-post"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Test e-post"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Kom igång med Calibre-Web"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-post: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "Det gick inte att skapa sökväg för omslag"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-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:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Endast jpg/jpeg-filer stöds som omslagsfil"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Väntar"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Startad"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Klar"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 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"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Kobo-installation"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "Det gick inte att logga in med GitHub."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Det gick inte att hämta användarinformation från GitHub."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Det gick inte att logga in med Google."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 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:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth-fel, försök igen senare."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth-fel, försök igen senare."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "logga in"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Token hittades inte"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Token har löpt ut"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Lyckades! Vänligen återvänd till din enhet"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Nyligen tillagda"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Visa senaste böcker"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Heta böcker"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Visa heta böcker"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Bäst rankade böcker"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Visa böcker med bästa betyg"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Lästa böcker"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Visa lästa och olästa"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Olästa böcker"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Visa olästa"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Upptäck"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Visa slumpmässiga böcker"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Kategorier"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Visa kategorival"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Serier"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Visa serieval"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Författare"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Visa författarval"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Förlag"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Visa urval av förlag"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Språk"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Visa språkval"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Betyg"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Visa val av betyg"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Filformat"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Visa val av filformat"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Ogiltig hylla specificerad"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Tyvärr får du inte lägga till en bok på hyllan: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Boken är redan en del av hyllan: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Boken har lagts till i hyllan: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Du får inte lägga till en bok i hyllan: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Böcker är redan en del av hyllan: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Böcker har lagts till hyllan: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Kunde inte lägga till böcker till hyllan: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Boken har tagits bort från hyllan: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hyllan %(title)s skapad"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "skapa en hylla"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hyllan %(title)s ändrad"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Redigera en hylla"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Hylla: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr "Dold bok"
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Nyligen tillagda"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Hylla: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Visa senaste böcker"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Heta böcker"
-
-#: cps/ub.py:73
-msgid "Show Hot Books"
-msgstr "Visa heta böcker"
-
-#: 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:683
-msgid "Top Rated Books"
-msgstr "Bäst rankade böcker"
-
-#: 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:82
-#: cps/web.py:944
-msgid "Read Books"
-msgstr "Lästa böcker"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Olästa böcker"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Visa olästa"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Upptäck"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Visa slumpmässiga böcker"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Kategorier"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Visa kategorival"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Serier"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Visa serieval"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Författare"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Visa författarval"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Förlag"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Visa urval av förlag"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Språk"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Visa språkval"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Betyg"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Visa val av betyg"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Filformat"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Visa val av filformat"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -889,254 +939,222 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "Böcker"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 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:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Sök"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, 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:1525
+#: cps/web.py:1260
 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:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "registrera"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "logga in"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Token hittades inte"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Token har löpt ut"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Lyckades! Vänligen återvänd till din enhet"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Läs en bok"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-bokkonverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1179,7 +1197,6 @@ 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:70
 msgid "Download"
 msgstr "Hämta"
 
@@ -1192,9 +1209,8 @@ msgid "Edit"
 msgstr "Redigera"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1234,10 +1250,6 @@ msgstr "SMTP-inloggning"
 msgid "From E-mail"
 msgstr "Från meddelande"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "Redigera grundläggande konfiguration"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -1246,7 +1258,7 @@ msgstr "Konfiguration"
 msgid "Calibre Database Directory"
 msgstr "Calibre DB dir"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Loggnivå"
 
@@ -1286,6 +1298,10 @@ msgstr "Omvänd proxy inloggning"
 msgid "Reverse proxy header name"
 msgstr "Omvänt proxy rubriknamn"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "Redigera grundläggande konfiguration"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "Redigera UI-konfiguration"
@@ -1343,16 +1359,17 @@ 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:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1372,44 +1389,44 @@ msgstr "via"
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "minska"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Mer av"
 
@@ -1445,13 +1462,13 @@ msgstr "Konvertera boken"
 msgid "Book Title"
 msgstr "Boktitel"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Författare"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -1459,15 +1476,15 @@ msgstr "Beskrivning"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1475,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Taggar"
 
@@ -1499,8 +1516,8 @@ msgstr "Ladda upp omslag från lokal enhet"
 msgid "Published Date"
 msgstr "Publiceringsdatum"
 
-#: 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Förlag"
@@ -1510,11 +1527,13 @@ msgstr "Förlag"
 msgid "Language"
 msgstr "Språk"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Nej"
 
@@ -1526,47 +1545,48 @@ 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:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "Spara"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Sökord"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Sök sökord "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Stäng"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Källa"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Sökningsfel!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "Inga resultat hittades! Försök med ett annat sökord."
 
@@ -1671,303 +1691,307 @@ msgstr "Bibliotekets konfiguration"
 msgid "Location of Calibre Database"
 msgstr "Plats för Calibre-databasen"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Använda Google Drive?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive-konfigurationsproblem"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Autentisera Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Klicka på skicka för att fortsätta med installationen"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Vänligen avsluta Google Drive-inställning efter inloggning"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre-mapp"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Titta på kanal ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Återkalla"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Serverport"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL certfile plats (lämna den tom för icke-SSL-servrar)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL Keyfile plats (lämna den tom för icke-SSL-servrar)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "Uppdatera kanal"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Stabil"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Ostabil"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Loggfil konfiguration"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Plats och namn på loggfilen (calibre-web.log för ingen post)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Aktivera åtkomstlogg"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Plats och namn på åtkomstloggfil (access.log för ingen post)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Aktivera uppladdning"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Aktivera anonym surfning"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Aktivera offentlig registrering"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Aktivera fjärrinloggning (\"magisk länk\")"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "Aktivera Kobo sync"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "Proxy okänd begäran till Kobo Store"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Använd Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Hämta en API-nyckel"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API-nyckel"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API-hemlighet"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Tillåt omvänd proxyautentisering"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Omvänt proxy rubriknamn"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Inloggningstyp"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "Använd standardautentisering"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "Använd LDAP-autentisering"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "Använd OAuth"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP-serverns värdnamn eller IP-adress"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "LDAP-serverport"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ingen"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP-adminstratörsanvändarnamn"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP-adminstratörslösenord"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP-användarobjektfilter"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP-server är OpenLDAP?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Skaffa %(provider)s OAuth-certifikat"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth-klient-id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth-klient-hemlighet"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Externa binärer"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Plats för Unrar-binär"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Logga in"
@@ -2166,10 +2190,6 @@ msgstr "Ange domännamn"
 msgid "Denied Domains (Blacklist)"
 msgstr "Nekade domäner för registrering"
 
-#: cps/templates/email_edit.html:99
-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:170
 msgid "Next"
 msgstr "Nästa"
@@ -2190,19 +2210,21 @@ msgstr "Skapa ärende"
 msgid "Return to Home"
 msgstr "Tillbaka till hemmet"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2274,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "Hem"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Tillbaka"
 
@@ -2304,7 +2325,7 @@ msgstr "Logga ut"
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
@@ -2328,11 +2349,11 @@ msgstr "Föregående"
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Fel"
 
@@ -2416,6 +2437,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-bokkatalog"
@@ -2576,23 +2621,27 @@ msgstr "Publiceringsdatum från"
 msgid "Published Date To"
 msgstr "Publiceringsdatum till"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Uteslut taggar"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Uteslut serier"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Uteslut språk"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Tillägg"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Uteslut tillägg"
 
@@ -2609,18 +2658,22 @@ msgid "Delete this Shelf"
 msgstr "Ta bort den här hyllan"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Redigera hyllan"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Ändra ordningen"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: 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:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Hylla kommer att tas bort för alla användare"
 
@@ -2632,6 +2685,10 @@ msgstr "Dela med alla"
 msgid "Drag to Rearrange Order"
 msgstr "Drag och släpp för att ändra ordning"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "Dold bok"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Calibre-biblioteksstatistik"
@@ -2732,15 +2789,11 @@ msgstr "Skapa/Visa"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "Lägg till tillåtna/avvisade anpassade kolumnvärden"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Ta bort den här användaren"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "Skapa Kobo Auth URL"
 
-#: 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 2b1f3800..a7692f32 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 88d1ee24..017b2c90 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -30,276 +30,313 @@ msgstr "yüklü değil"
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Sunucu yeniden başlatıldı, lütfen sayfayı yeniden yükleyin"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Sunucu kapatıyor, lütfen pencereyi kapatın"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Yönetim sayfası"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Arayüz Ayarları"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Temel Ayarlar"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "Bu e-posta adresi için bir hesap mevcut."
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Bilinmeyen bir hata oluştu."
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, 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:976
+#: cps/admin.py:1194
 #, 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:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 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:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 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:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "ayarlanmadı"
@@ -308,98 +345,98 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 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:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "metaveri düzenle"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s geçerli bir dil değil"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, 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:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, 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:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 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:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 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:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 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:926
+#: cps/editbooks.py:951
 #, 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:930
+#: cps/editbooks.py:955
 #, 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,457 +445,470 @@ msgstr "Bu eKitabı dönüştürürken bir hata oluştu: %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive kurulumu tamamlanmadı, Google Drive'ı devre dışı bırakmayı ve tekrar etkinleştirmeyi deneyin"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 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:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, 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:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s bulunamadı: %(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web deneme e-Postası"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "Deneme e-Postası"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Web'i Kullanmaya Başlayın"
 
-#: cps/helper.py:136
+#: 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:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "e-Posta: %(book)s"
 
-#: cps/helper.py:235
+#: 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:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: 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:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "Bekleniyor"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "Başarısız"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "Başladı"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "Bitti"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "Bilinmeyen Durum"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "GitHub ile giriş yapılamadı."
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "Github'dan kullanıcı bilgileri alınamadı."
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "Google ile giriş yapılamadı."
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr "Google'dan kullanıcı bilgileri alınamadı."
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth hatası, lütfen tekrar deneyin."
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth hatası, lütfen tekrar deneyin."
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "giriş"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Token bulunamadı"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Token süresi doldu"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Başarılı! Lütfen cihazınıza dönün"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Yeni"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Son eKitapları göster"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Popüler"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr ""
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr ""
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr ""
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Okunanlar"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Okunan ve okunmayanları göster"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Okunmamışlar"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "Okunmamışları göster"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Keşfet"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Rastgele eKitap göster"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Kategoriler"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Kategori seçimini göster"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Seriler"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Seri seçimini göster"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Yazarlar"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Yazar seçimini göster"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "Yayıncılar"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "Yayıncı seçimini göster"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Diller"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Dil seçimini göster"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "Değerlendirmeler"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "Değerlendirme seçimini göster"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "Biçimler"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "Dosya biçimi seçimini göster"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "Geçersiz kitaplık seçildi"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Maalesef bu kitaplığa eKitap eklemenize izin verilmiyor: %(shelfname)s"
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "eKitap zaten bu kitaplıkta bulunuyor: %(shelfname)s"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "eKitap kitaplığa eklendi: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Bu kitaplığa eKitap eklemenize izin verilmiyor: %(name)s"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "eKitaplar zaten bu kitaplıkta bulunuyor: %(name)s"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "eKitaplar kitaplığa eklendi: %(sname)s"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "eKitaplar kitaplığa eklenemedi: %(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "eKitap kitaplıktan silindi: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Maalesef bu kitaplıktan eKitap silmenize izin verilmiyor: %(sname)s"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s kitaplığı oluşturuldu."
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "Kitaplık oluştur"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s kitaplığı değiştirildi"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr "Kitaplığı düzenle"
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Kitaplık: '%(name)s'"
-
-#: cps/shelf.py:372
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Kitaplık açılırken hata oluştu. Kitaplık mevcut değil ya da erişilebilir değil"
-
-#: cps/shelf.py:409
-msgid "Hidden Book"
-msgstr ""
-
-#: cps/shelf.py:414
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Yeni"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Kitaplık: '%(name)s'"
 
-#: cps/ub.py:70
-msgid "Show recent books"
-msgstr "Son eKitapları göster"
-
-#: cps/templates/index.xml:17 cps/ub.py:71
-msgid "Hot Books"
-msgstr "Popüler"
-
-#: 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:683
-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:944
-msgid "Read Books"
-msgstr "Okunanlar"
-
-#: 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:86
-#: cps/web.py:947
-msgid "Unread Books"
-msgstr "Okunmamışlar"
-
-#: cps/ub.py:88
-msgid "Show unread"
-msgstr "Okunmamışları göster"
-
-#: cps/ub.py:89
-msgid "Discover"
-msgstr "Keşfet"
-
-#: cps/ub.py:91
-msgid "Show random books"
-msgstr "Rastgele eKitap göster"
-
-#: cps/templates/book_table.html:50 cps/templates/index.xml:75 cps/ub.py:92
-#: cps/web.py:1248
-msgid "Categories"
-msgstr "Kategoriler"
-
-#: cps/ub.py:94
-msgid "Show category selection"
-msgstr "Kategori seçimini göster"
-
-#: 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:1152 cps/web.py:1162
-msgid "Series"
-msgstr "Seriler"
-
-#: cps/ub.py:97
-msgid "Show series selection"
-msgstr "Seri seçimini göster"
-
-#: cps/templates/book_table.html:49 cps/templates/index.xml:61 cps/ub.py:98
-msgid "Authors"
-msgstr "Yazarlar"
-
-#: cps/ub.py:100
-msgid "Show author selection"
-msgstr "Yazar seçimini göster"
-
-#: cps/templates/book_table.html:55 cps/templates/index.xml:68 cps/ub.py:102
-#: cps/web.py:1131
-msgid "Publishers"
-msgstr "Yayıncılar"
-
-#: cps/ub.py:104
-msgid "Show publisher selection"
-msgstr "Yayıncı seçimini göster"
-
-#: cps/templates/book_table.html:53 cps/templates/index.xml:89
-#: cps/templates/search_form.html:75 cps/ub.py:105 cps/web.py:1227
-msgid "Languages"
-msgstr "Diller"
-
-#: cps/ub.py:108
-msgid "Show language selection"
-msgstr "Dil seçimini göster"
-
-#: cps/templates/index.xml:96 cps/ub.py:109
-msgid "Ratings"
-msgstr "Değerlendirmeler"
-
-#: cps/ub.py:111
-msgid "Show ratings selection"
-msgstr "Değerlendirme seçimini göster"
-
-#: cps/templates/index.xml:104 cps/ub.py:112
-msgid "File formats"
-msgstr "Biçimler"
-
-#: cps/ub.py:114
-msgid "Show file formats selection"
-msgstr "Dosya biçimi seçimini göster"
-
-#: cps/ub.py:116 cps/web.py:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Kitaplık açılırken hata oluştu. Kitaplık mevcut değil ya da erişilebilir değil"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -889,254 +939,222 @@ msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdak
 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:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "eKitaplar"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Ara"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, 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:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 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:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "kaydol"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 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:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 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:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "giriş"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Token bulunamadı"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Token süresi doldu"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Başarılı! Lütfen cihazınıza dönün"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Kitap Oku"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "eKitap-Dönüştürücü hatası: %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1179,7 +1197,6 @@ 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:70
 msgid "Download"
 msgstr "İndirme"
 
@@ -1192,9 +1209,8 @@ msgid "Edit"
 msgstr "Düzenleme"
 
 #: 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Sil"
 
@@ -1234,10 +1250,6 @@ msgstr ""
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr ""
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Ayarlar"
@@ -1246,7 +1258,7 @@ msgstr "Ayarlar"
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "Log Seviyesi"
 
@@ -1286,6 +1298,10 @@ msgstr ""
 msgid "Reverse proxy header name"
 msgstr "Ters Proxy header adı"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
@@ -1343,16 +1359,17 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr ""
 
@@ -1372,44 +1389,44 @@ msgstr "ile"
 msgid "In Library"
 msgstr "Kitaplıkta"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "azalt"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "daha fazla"
 
@@ -1445,13 +1462,13 @@ msgstr "eKitabı dönüştür"
 msgid "Book Title"
 msgstr "Kitap Adı"
 
-#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:11
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 cps/templates/search_form.html:11
 msgid "Author"
 msgstr "Yazar"
 
-#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:127
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Açıklama"
 
@@ -1459,15 +1476,15 @@ msgstr "Açıklama"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1475,7 +1492,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Etiketler"
 
@@ -1499,8 +1516,8 @@ msgstr ""
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Yayınevi"
@@ -1510,11 +1527,13 @@ msgstr "Yayınevi"
 msgid "Language"
 msgstr "Dil"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Evet"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Hayır"
 
@@ -1526,47 +1545,48 @@ msgstr ""
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Anahtar Kelime"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "Anahtar kelime ara"
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Kapak"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Kaynak"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Arama hatası!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1671,303 +1691,307 @@ msgstr "Kitaplık Ayarları"
 msgid "Location of Calibre Database"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Google Drive kullan?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive ayarlama problemi"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Google Drive Doğrula"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "Kuruluma devam etmek için Gönder'e tıklayın"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "Lütfen giriş yaptıktan sonra Google Drive kurulumunu tamamlayın"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre klasörü"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metaveri İzleme Kanalı ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Kaldır"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Sunucu Ayarları"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Sunucu Port"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL certfile dosyası konumu (SSL olmayan sunucular için boş bırakın)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL keyfile dosyası konumu (SSL olmayan sunucular için boş bırakın)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr ""
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "Kararlı"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "Gecelik"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Log Dosyası Ayarları"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Log dosyası konumu ve adı (girilmemişse calibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "Erişim Log'unu etkinleştir"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "Erişim dosyası konumu ve adı (girilmemişse access.log)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr ""
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr ""
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "Goodreads kullan"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API Anahtarı"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API şifresi"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Ters Proxy Kimlik Doğrulamaya İzin Ver"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "Ters Proxy Header Adı"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "Giriş türü"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "LDAP Kimlik Doğrulama kullan"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "OAuth kullan"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP Sunucu adı veya IP Adresi"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "LDAP Sunucu Portu"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Hiçbiri"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Ayırt Edici Adı (DN)"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP Sunucusu OpenLDAP kullanıyor?"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "%(provider)s OAuth Kimlik Bilgisi Al"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "Harici Uygulamalar"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrar aracı konumu"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Giriş"
@@ -2166,10 +2190,6 @@ msgstr "Servis adı girin"
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/email_edit.html:99
-msgid "Are you sure you want to delete this domain?"
-msgstr ""
-
 #: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Sonraki"
@@ -2190,19 +2210,21 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2274,8 +2296,7 @@ msgstr ""
 msgid "Home"
 msgstr "Anasayfa"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Geri"
 
@@ -2304,7 +2325,7 @@ msgstr "Çıkış"
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
@@ -2328,11 +2349,11 @@ msgstr "Önceki"
 msgid "Book Details"
 msgstr "eKitap Detayları"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "Hata"
 
@@ -2416,6 +2437,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2576,23 +2621,27 @@ msgstr ""
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Etiketleri Hariç Tut"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Serileri Hariç Tut"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Dilleri Hariç Tut"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "Uzantılar"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "Uzantıları Hariç Tut"
 
@@ -2609,18 +2658,22 @@ msgid "Delete this Shelf"
 msgstr "Bu Kitaplığı sil"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "Kitaplığı düzenle"
-
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Sıralamayı değiştir"
-
-#: cps/templates/shelf.html:75
-msgid "Are you sure you want to delete this shelf?"
+msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
+
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr ""
 
@@ -2632,6 +2685,10 @@ msgstr ""
 msgid "Drag to Rearrange Order"
 msgstr ""
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr ""
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr ""
@@ -2732,15 +2789,11 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: 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 96f2ded1..1f904ced 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 a8918c1a..5c52a724 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+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"
@@ -29,276 +29,313 @@ msgstr "не встановлено"
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "Сторінка адміністратора"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "Ви справді хочете видалити книжкову полицю?"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "Сталась невідома помилка"
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr ""
@@ -307,98 +344,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Сталась помилка при відкриванні eBook. Файл не існує або відсутній доступ до нього"
 
-#: cps/editbooks.py:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -407,457 +444,470 @@ msgstr ""
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr ""
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
 
-#: cps/helper.py:82
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:136
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr ""
 
-#: cps/helper.py:235
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "увійти"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "Токен не знайдено"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Час дії токено вичерпано"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "Останні додані"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "Показувати останні книги"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "Популярні книги"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "Показувати популярні книги"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "Книги з найкращим рейтингом"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "Показувати книги з найвищим рейтингом"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "Прочитані книги"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "Показувати прочитані та непрочитані книги"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "Непрочитані книги"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr ""
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "Огляд"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "Показувати випадкові книги"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "Категорії"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "Показувати вибір категорії"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "Серії"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "Показувати вибір серії"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "Автори"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "Показувати вибір автора"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr ""
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr ""
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "Мови"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "Показувати вибір мови"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr ""
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr ""
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Книга додана на книжкову полицю: %(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга видалена з книжкової полиці: %(sname)s"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Створена книжкова полиця %(title)s"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "Сталась помилка"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "створити книжкову полицю"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжкова полиця %(title)s змінена"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 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
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "Останні додані"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Книжкова полиця: '%(name)s'"
 
-#: 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:683
-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:944
-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:947
-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:1248
-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:1152 cps/web.py:1162
-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:1131
-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:1227
-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:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr ""
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -888,254 +938,222 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "зареєструватись"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "увійти"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "Токен не знайдено"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Час дії токено вичерпано"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "Читати книгу"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1178,7 +1196,6 @@ 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 "Завантажити"
 
@@ -1191,9 +1208,8 @@ 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "Видалити"
 
@@ -1233,10 +1249,6 @@ msgstr "SMTP логін"
 msgid "From E-mail"
 msgstr "Відправник"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr ""
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "Налаштування сервера"
@@ -1245,7 +1257,7 @@ msgstr "Налаштування сервера"
 msgid "Calibre Database Directory"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr ""
 
@@ -1285,6 +1297,10 @@ msgstr ""
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
@@ -1342,16 +1358,17 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr ""
 
@@ -1371,44 +1388,44 @@ msgstr "через"
 msgid "In Library"
 msgstr "У бібліотеці"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "Більше за"
 
@@ -1444,13 +1461,13 @@ msgstr ""
 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
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 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
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "Опис"
 
@@ -1458,15 +1475,15 @@ msgstr "Опис"
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1474,7 +1491,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "Теги"
 
@@ -1498,8 +1515,8 @@ msgstr ""
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "Видавець"
@@ -1509,11 +1526,13 @@ msgstr "Видавець"
 msgid "Language"
 msgstr "Мова"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "Так"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "Ні"
 
@@ -1525,47 +1544,48 @@ msgstr "Формат завантаження"
 msgid "View Book on Save"
 msgstr "переглянути книгу після редагування"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Ключове слово"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Пошук по ключовому слову"
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Натисніть на обкладинку, щоб отримати метадані"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "Закрити"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "Джерело"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "Помилка пошуку!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1670,303 +1690,307 @@ msgstr "Налаштування бібліотеки"
 msgid "Location of Calibre Database"
 msgstr "Розташування БД Calibre"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "Використовувати Google Drive?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive проблема налаштування"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "Автентифікація Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr ""
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr ""
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Папка Calibre в Google Drive"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "Скасувати"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "Налаштування серверу"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "Порт сервера"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "Розташування сертифіката SSL (залиште його порожнім для серверів, які не використовують SSL)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Розташування ключових слів SSL (залиште його порожнім для серверів, які не використовують SSL)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr ""
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr ""
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr ""
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "Logfile налаштування"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Розташування і назва логфайлу (calibre-web.log for no entry)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr ""
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "Дозволити завантаження книг на сервер"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "Дозволити анонімний перегляд"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "Дозволити публічну реєстрацію"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "Включити віддалений логін (\"magic link\")"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr ""
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "Отримати ключ API"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ні"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
-#, python-format
-msgid "Obtain %(provider)s OAuth Credential"
-msgstr ""
-
-#: cps/templates/config_edit.html:357
-#, python-format
-msgid "%(provider)s OAuth Client Id"
-msgstr ""
-
 #: cps/templates/config_edit.html:361
 #, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:364
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:368
+#, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Ім'я користувача"
@@ -2165,10 +2189,6 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/email_edit.html:99
-msgid "Are you sure you want to delete this domain?"
-msgstr ""
-
 #: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "Далі"
@@ -2189,19 +2209,21 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2273,8 +2295,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "Назад"
 
@@ -2303,7 +2324,7 @@ msgstr "Вийти"
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "Завантаження..."
 
@@ -2327,11 +2348,11 @@ msgstr "Попередній перегляд"
 msgid "Book Details"
 msgstr "Деталі"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr ""
 
@@ -2415,6 +2436,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2575,23 +2620,27 @@ msgstr "Дата публікації з"
 msgid "Published Date To"
 msgstr "Дата публікації до"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "Виключити теги"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "Виключити серії"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "Виключити мови"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
@@ -2608,18 +2657,22 @@ msgid "Delete this Shelf"
 msgstr "Видалити цю книжкову полицю"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
+msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "Змінити порядок"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: cps/templates/shelf.html:75
-msgid "Are you sure you want to delete this shelf?"
-msgstr "Ви справді хочете видалити книжкову полицю?"
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "Книжкова полиця буде остаточно видалена для всіх"
 
@@ -2631,6 +2684,10 @@ msgstr "зробити книжкову полицю доступною для 
 msgid "Drag to Rearrange Order"
 msgstr "Перетягніть для змінення порядку"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr ""
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "Статистика бібліотеки Calibre"
@@ -2731,15 +2788,11 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "Видалити цього користувача"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: 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 f78d3164..a3f7715c 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 9518a5f5..1c47f86e 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-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_CN\n"
@@ -30,276 +30,313 @@ msgstr "未安装"
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr "重新连接成功"
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "您确定删除Kobo Token吗？"
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr "您确定要删除此书架吗？"
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "隐藏"
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "显示"
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr "此邮箱的账号已经存在。"
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "更新文件无法保存在临时目录中"
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "错误：%(ldaperror)s"
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr "错误：在LDAP服务器的响应中没有返回用户"
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr "创建至少一个LDAP用户失败"
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "数据库中没有找到至少一个LDAP用户"
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr "未配置"
@@ -308,98 +345,98 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/editbooks.py:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s 不是一种有效语言"
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -408,457 +445,470 @@ msgstr "转换此书籍时出现错误： %(res)s"
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云端硬盘"
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:82
+#: 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:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:136
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "邮件：%(book)s"
 
-#: cps/helper.py:235
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:332
+#: 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:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:348
+#: 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:403
+#: 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:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
-msgstr "仅将jpg、jpeg、png、webp文件作为封面文件"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr "使用Github登录失败。"
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr "从Github获取用户信息失败。"
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr "使用Google登录失败。"
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr "从Google获取用户信息失败。"
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "链接到%(oauth)s成功"
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "登录失败，没有用户与OAuth帐户关联"
 
-#: cps/oauth_bb.py:283
+#: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "取消链接到%(oauth)s成功"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:291
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "取消链接到%(oauth)s失败"
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "为连接到%(oauth)s"
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth 错误，请重试。"
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth 错误，请重试。"
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr "登录"
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr "找不到Token"
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr "Token已过期"
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr "成功！请返回您的设备"
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr "最近添加"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "显示最近书籍"
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr "热门书籍"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "显示热门书籍"
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr "下载历史"
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr "显示下载过的书籍"
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr "最高评分书籍"
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr "显示最高评分书籍"
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr "已读书籍"
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr "显示阅读状态"
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr "未读书籍"
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr "显示未读"
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr "发现"
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr "显示随机书籍"
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr "分类"
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr "显示分类选择"
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr "丛书"
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr "显示丛书选择"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr "作者"
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr "显示作者选择"
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr "出版社"
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr "显示出版社选择"
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr "语言"
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr "显示语言选择"
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr "评分"
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr "显示评分选择"
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr "文件格式"
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr "显示文件格式选择"
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr "归档书籍"
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr "显示归档书籍"
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr "书籍列表"
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr "显示书籍列表"
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr "指定的书架无效"
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, 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
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "此书籍已经是书架 %(shelfname)s 的一部分"
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书籍已被添加到书架：%(sname)s"
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "您没有添加书籍到书架 %(name)s 的权限"
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "书籍已经在书架 %(name)s 中了"
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "书籍已经被添加到书架 %(sname)s 中"
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "无法添加书籍到书架：%(sname)s"
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, 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
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 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
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/ub.py:68
-msgid "Recently Added"
-msgstr "最近添加"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "书架：%(name)s"
 
-#: 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:683
-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:944
-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:947
-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:1248
-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:1152 cps/web.py:1162
-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:1131
-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:1227
-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:971
-msgid "Archived Books"
-msgstr "归档书籍"
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr "显示归档书籍"
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr "书籍列表"
-
-#: cps/ub.py:122
-msgid "Show Books List"
-msgstr "显示书籍列表"
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "打开书架出错。书架不存在或不可访问"
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
 msgid "Unexpected data while reading update information"
@@ -889,254 +939,222 @@ msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 msgid "Click on the button below to update to the latest stable version."
 msgstr "点击下面按钮更新到最新稳定版本。"
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "错误：%(ldaperror)s"
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr "错误：在LDAP服务器的响应中没有返回用户"
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr "创建至少一个LDAP用户失败"
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "数据库中没有找到至少一个LDAP用户"
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr "书籍"
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr "搜索"
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr "这个用户名或者邮箱已被使用。"
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr "登录"
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr "找不到Token"
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr "Token已过期"
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr "成功！请返回您的设备"
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr "发生未知错误，书籍转换失败"
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
@@ -1179,7 +1197,6 @@ 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 "下载书籍"
 
@@ -1192,9 +1209,8 @@ 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr "删除数据"
 
@@ -1234,10 +1250,6 @@ msgstr "SMTP用户名"
 msgid "From E-mail"
 msgstr "发件人邮箱"
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr "编辑基本配置"
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr "配置"
@@ -1246,7 +1258,7 @@ msgstr "配置"
 msgid "Calibre Database Directory"
 msgstr "Calibre 数据库路径"
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr "日志级别"
 
@@ -1286,6 +1298,10 @@ msgstr "反向代理登录"
 msgid "Reverse proxy header name"
 msgstr "反向代理头部名称"
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr "编辑基本配置"
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr "编辑界面配置"
@@ -1343,16 +1359,17 @@ msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr "确定"
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr "取消"
 
@@ -1372,44 +1389,44 @@ msgstr "通过"
 msgid "In Library"
 msgstr "在书库"
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr "减少"
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr "更多"
 
@@ -1445,13 +1462,13 @@ msgstr "转换书籍"
 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
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 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
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr "简介"
 
@@ -1459,15 +1476,15 @@ msgstr "简介"
 msgid "Identifiers"
 msgstr "书号"
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr "书号类型"
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr "书号编号"
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr "移除"
 
@@ -1475,7 +1492,7 @@ msgstr "移除"
 msgid "Add Identifier"
 msgstr "添加书号"
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr "标签"
 
@@ -1499,8 +1516,8 @@ msgstr "从本地磁盘上传封面"
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr "出版社"
@@ -1510,11 +1527,13 @@ msgstr "出版社"
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr "没有"
 
@@ -1526,47 +1545,48 @@ msgstr "上传格式"
 msgid "View Book on Save"
 msgstr "查看保存书籍"
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr "保存"
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " 搜索关键字 "
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "单击封面将元数据加载到表单"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr "关闭"
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr "源"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr "搜索错误！"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr "无搜索结果！请尝试另一个关键字。"
 
@@ -1671,303 +1691,307 @@ msgstr "书库配置"
 msgid "Location of Calibre Database"
 msgstr "Calibre 数据库路径"
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr "是否使用Google Drive?"
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr "Google Drive 配置问题"
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr "认证 Google Drive"
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr "请点击提交以继续设置"
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr "登录后请完成Google Drive设置"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre 路径"
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr "元数据监视通道ID"
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr "撤回"
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr "服务器配置"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr "服务器端口"
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL 证书文件路径(非SSL服务器请留空)"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL 密钥文件路径(非SSL服务器请留空)"
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr "更新通道"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr "稳定版"
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr "夜间版"
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr "日志文件配置"
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "日志文件路径和名称(默认为calibre-web.log)"
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr "启用访问日志"
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr "访问日志路径和名称(默认为access.log)"
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr "功能配置"
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr "启用上传"
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr "允许上传的文件格式"
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr "允许匿名浏览"
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr "启用注册"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr "使用邮箱或用户名"
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr "启用魔法链接远程登录"
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr "启用Kobo同步"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr "代理未知请求到Kobo商店"
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr "服务器扩展端口(用于转发的API调用的端口)"
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr "使用Goodreads"
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr "创建API Key"
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr "Goodreads API Key"
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr "允许反向代理认证方式"
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr "反向代理头部名称"
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr "登录类型"
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr "使用标准认证"
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr "使用LDAP认证"
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr "使用OAuth认证"
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP服务器主机名或IP地址"
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr "LDAP服务器端口"
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr "LDAP 加密"
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "无"
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr "TLS协议"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr "SSL协议"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr "LDAP 验证方式"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr "匿名"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr "无验证"
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr "简单"
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr "LDAP管理员用户名"
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr "LDAP管理员密码"
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP专有名称（DN）"
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr "LDAP用户对象过滤器"
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP服务器是 OpenLDAP？"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr "用户导入需要以下设置"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr "LDAP组对象过滤器"
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr "LDAP组名"
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr "LDAP组成员字段"
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
+#: cps/templates/config_edit.html:361
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "获取 %(provider)s OAuth凭证"
 
-#: cps/templates/config_edit.html:357
+#: cps/templates/config_edit.html:364
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth 客户端 Secret"
 
-#: cps/templates/config_edit.html:361
+#: cps/templates/config_edit.html:368
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth 客户端 Secret"
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr "扩展程序配置"
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr "Calibre 电子书转换器路径"
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr "Calibre 电子书转换器设置"
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr "KEpubify 电子书转换器路径"
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr "Unrar程序路径"
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "登录"
@@ -2166,10 +2190,6 @@ msgstr "输入域名"
 msgid "Denied Domains (Blacklist)"
 msgstr "禁止注册的域名（黑名单）"
 
-#: cps/templates/email_edit.html:99
-msgid "Are you sure you want to delete this domain?"
-msgstr "您确定要删除此域名吗？"
-
 #: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr "下一个"
@@ -2190,19 +2210,21 @@ msgstr "创建问题"
 msgid "Return to Home"
 msgstr "回到首页"
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2274,8 +2296,7 @@ msgstr "书架上的书"
 msgid "Home"
 msgstr "首页"
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr "后退"
 
@@ -2304,7 +2325,7 @@ msgstr "注销"
 msgid "Register"
 msgstr "注册"
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr "正在上传..."
 
@@ -2328,11 +2349,11 @@ msgstr "上一个"
 msgid "Book Details"
 msgstr "书籍详情"
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr "错误"
 
@@ -2416,6 +2437,30 @@ msgstr "Kobo 重要说明：被删除的书籍将保留在任何配对的 Kobo 
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr "必须先将书籍存档并同步设备，然后才能安全地删除书籍。"
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr "Caliebre-Web电子书路径"
@@ -2576,23 +2621,27 @@ msgstr "出版日期从"
 msgid "Published Date To"
 msgstr "出版日期到"
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr "排除标签"
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr "排除丛书"
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr "排除语言"
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr "扩展名"
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr "排除扩展名"
 
@@ -2609,18 +2658,22 @@ msgid "Delete this Shelf"
 msgstr "删除此书架"
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
-msgstr "编辑书架"
+msgid "Edit Shelf Properties"
+msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
-msgstr "修改排序"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
+msgstr ""
 
-#: cps/templates/shelf.html:75
-msgid "Are you sure you want to delete this shelf?"
-msgstr "您确定要删除此书架吗？"
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
+msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr "书架将会重所有用户中删除"
 
@@ -2632,6 +2685,10 @@ msgstr "书架将被公开"
 msgid "Drag to Rearrange Order"
 msgstr "拖拽以重新排序"
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr "隐藏书籍"
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr "书库统计"
@@ -2732,15 +2789,11 @@ msgstr "新建或查看"
 msgid "Add allowed/Denied Custom Column Values"
 msgstr "添加显示或隐藏书籍的自定义栏目值"
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr "删除此用户"
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr "生成Kobo Auth 地址"
 
-#: cps/templates/user_edit.html:166
-msgid "Do you really want to delete the Kobo Token?"
-msgstr "您确定删除Kobo Token吗？"
-
diff --git a/cps/ub.py b/cps/ub.py
index 145575d1..f11b77b9 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -26,10 +26,8 @@ import uuid
 from flask import session as flask_session
 from binascii import hexlify
 
-from flask import g
-from flask_babel import gettext as _
 from flask_login import AnonymousUserMixin, current_user
-from werkzeug.local import LocalProxy
+
 try:
     from flask_dance.consumer.backend.sqla import OAuthConsumerMixin
     oauth_support = True
@@ -45,7 +43,7 @@ from sqlalchemy import Column, ForeignKey
 from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm.attributes import flag_modified
-from sqlalchemy.orm import backref, relationship, sessionmaker, Session
+from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
 from . import constants
@@ -57,73 +55,6 @@ Base = declarative_base()
 searched_ids = {}
 
 
-def get_sidebar_config(kwargs=None):
-    kwargs = kwargs or []
-    if 'content' in kwargs:
-        content = kwargs['content']
-        content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()
-    else:
-        content = 'conf' in kwargs
-    sidebar = list()
-    sidebar.append({"glyph": "glyphicon-book", "text": _('Recently Added'), "link": 'web.index', "id": "new",
-                    "visibility": constants.SIDEBAR_RECENT, 'public': True, "page": "root",
-                    "show_text": _('Show recent books'), "config_show":False})
-    sidebar.append({"glyph": "glyphicon-fire", "text": _('Hot Books'), "link": 'web.books_list', "id": "hot",
-                    "visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot",
-                    "show_text": _('Show Hot Books'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.books_list',
-                    "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not g.user.is_anonymous),
-                    "page": "download", "show_text": _('Show Downloaded Books'),
-                    "config_show": content})
-    sidebar.append(
-        {"glyph": "glyphicon-star", "text": _('Top Rated Books'), "link": 'web.books_list', "id": "rated",
-         "visibility": constants.SIDEBAR_BEST_RATED, 'public': True, "page": "rated",
-         "show_text": _('Show Top Rated Books'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-eye-open", "text": _('Read Books'), "link": 'web.books_list', "id": "read",
-                    "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous),
-                    "page": "read", "show_text": _('Show read and unread'), "config_show": content})
-    sidebar.append(
-        {"glyph": "glyphicon-eye-close", "text": _('Unread Books'), "link": 'web.books_list', "id": "unread",
-         "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous), "page": "unread",
-         "show_text": _('Show unread'), "config_show": False})
-    sidebar.append({"glyph": "glyphicon-random", "text": _('Discover'), "link": 'web.books_list', "id": "rand",
-                    "visibility": constants.SIDEBAR_RANDOM, 'public': True, "page": "discover",
-                    "show_text": _('Show random books'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-inbox", "text": _('Categories'), "link": 'web.category_list', "id": "cat",
-                    "visibility": constants.SIDEBAR_CATEGORY, 'public': True, "page": "category",
-                    "show_text": _('Show category selection'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-bookmark", "text": _('Series'), "link": 'web.series_list', "id": "serie",
-                    "visibility": constants.SIDEBAR_SERIES, 'public': True, "page": "series",
-                    "show_text": _('Show series selection'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-user", "text": _('Authors'), "link": 'web.author_list', "id": "author",
-                    "visibility": constants.SIDEBAR_AUTHOR, 'public': True, "page": "author",
-                    "show_text": _('Show author selection'), "config_show": True})
-    sidebar.append(
-        {"glyph": "glyphicon-text-size", "text": _('Publishers'), "link": 'web.publisher_list', "id": "publisher",
-         "visibility": constants.SIDEBAR_PUBLISHER, 'public': True, "page": "publisher",
-         "show_text": _('Show publisher selection'), "config_show":True})
-    sidebar.append({"glyph": "glyphicon-flag", "text": _('Languages'), "link": 'web.language_overview', "id": "lang",
-                    "visibility": constants.SIDEBAR_LANGUAGE, 'public': (g.user.filter_language() == 'all'),
-                    "page": "language",
-                    "show_text": _('Show language selection'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-star-empty", "text": _('Ratings'), "link": 'web.ratings_list', "id": "rate",
-                    "visibility": constants.SIDEBAR_RATING, 'public': True,
-                    "page": "rating", "show_text": _('Show ratings selection'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-file", "text": _('File formats'), "link": 'web.formats_list', "id": "format",
-                    "visibility": constants.SIDEBAR_FORMAT, 'public': True,
-                    "page": "format", "show_text": _('Show file formats selection'), "config_show": True})
-    sidebar.append(
-        {"glyph": "glyphicon-trash", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
-         "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not g.user.is_anonymous), "page": "archived",
-         "show_text": _('Show archived books'), "config_show": content})
-    sidebar.append(
-        {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
-         "visibility": constants.SIDEBAR_LIST, 'public': (not g.user.is_anonymous), "page": "list",
-         "show_text": _('Show Books List'), "config_show": content})
-
-    return sidebar
-
-
 def store_ids(result):
     ids = list()
     for element in result:
@@ -521,7 +452,7 @@ def migrate_Database(session):
     if not engine.dialect.has_table(engine.connect(), "archived_book"):
         ArchivedBook.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "registration"):
-        ReadBook.__table__.create(bind=engine)
+        Registration.__table__.create(bind=engine)
         with engine.connect() as conn:
             conn.execute("insert into registration (domain, allow) values('%.%',1)")
         session.commit()
@@ -570,12 +501,16 @@ def migrate_Database(session):
         for book_shelf in session.query(BookShelf).all():
             book_shelf.date_added = datetime.datetime.now()
         session.commit()
-    # Handle table exists, but no content
-    cnt = session.query(Registration).count()
-    if not cnt:
-        with engine.connect() as conn:
-            conn.execute("insert into registration (domain, allow) values('%.%',1)")
-        session.commit()
+    try:
+        # Handle table exists, but no content
+        cnt = session.query(Registration).count()
+        if not cnt:
+            with engine.connect() as conn:
+                conn.execute("insert into registration (domain, allow) values('%.%',1)")
+            session.commit()
+    except exc.OperationalError:  # Database is not writeable
+        print('Settings database is not writeable. Exiting...')
+        sys.exit(2)
     try:
         session.query(exists().where(BookShelf.order)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
@@ -660,7 +595,7 @@ def migrate_Database(session):
         session.commit()
     except exc.OperationalError:
         print('Settings database is not writeable. Exiting...')
-        sys.exit(1)
+        sys.exit(2)
 
 
 def clean_database(session):
@@ -678,13 +613,19 @@ def update_download(book_id, user_id):
     if not check:
         new_download = Downloads(user_id=user_id, book_id=book_id)
         session.add(new_download)
-        session.commit()
+        try:
+            session.commit()
+        except exc.OperationalError:
+            session.rollback()
 
 
 # Delete non exisiting downloaded books in calibre-web's own database
 def delete_download(book_id):
     session.query(Downloads).filter(book_id == Downloads.book_id).delete()
-    session.commit()
+    try:
+        session.commit()
+    except exc.OperationalError:
+        session.rollback()
 
 # Generate user Guest (translated text), as anonymous user, no rights
 def create_anonymous_user(session):
@@ -725,7 +666,7 @@ def init_db(app_db_path):
     app_DB_path = app_db_path
     engine = create_engine(u'sqlite:///{0}'.format(app_db_path), echo=False)
 
-    Session = sessionmaker()
+    Session = scoped_session(sessionmaker())
     Session.configure(bind=engine)
     session = Session()
 
diff --git a/cps/uploader.py b/cps/uploader.py
index 2cb982b9..4612791b 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -66,14 +66,6 @@ except ImportError as e:
     log.debug('Cannot import fb2, extracting fb2 metadata will not work: %s', e)
     use_fb2_meta = False
 
-try:
-    from PIL import Image as PILImage
-    from PIL import __version__ as PILversion
-    use_PIL = True
-except ImportError as e:
-    log.debug('Cannot import Pillow, using png and webp images as cover will not work: %s', e)
-    use_PIL = False
-
 
 def process(tmp_file_path, original_file_name, original_file_extension, rarExecutable):
     meta = None
@@ -179,10 +171,6 @@ def get_versions():
         XVersion = 'v'+'.'.join(map(str, lxmlversion))
     else:
         XVersion = u'not installed'
-    if use_PIL:
-        PILVersion = 'v' + PILversion
-    else:
-        PILVersion = u'not installed'
     if comic.use_comic_meta:
         ComicVersion = comic.comic_version or u'installed'
     else:
@@ -191,7 +179,7 @@ def get_versions():
             'PyPdf': PVersion,
             'lxml':XVersion,
             'Wand': WVersion,
-            'Pillow': PILVersion,
+            # 'Pillow': PILVersion,
             'Comic_API': ComicVersion}
 
 
diff --git a/cps/usermanagement.py b/cps/usermanagement.py
new file mode 100644
index 00000000..3a00f34d
--- /dev/null
+++ b/cps/usermanagement.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2018-2020 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import base64
+import binascii
+
+from sqlalchemy.sql.expression import func
+from werkzeug.security import check_password_hash
+from flask_login import login_required
+
+from . import lm, ub, config, constants, services
+
+try:
+    from functools import wraps
+except ImportError:
+    pass  # We're not using Python 3
+
+def login_required_if_no_ano(func):
+    @wraps(func)
+    def decorated_view(*args, **kwargs):
+        if config.config_anonbrowse == 1:
+            return func(*args, **kwargs)
+        return login_required(func)(*args, **kwargs)
+
+    return decorated_view
+
+
+def _fetch_user_by_name(username):
+    return ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == username.lower()).first()
+
+
+@lm.user_loader
+def load_user(user_id):
+    return ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
+
+
+@lm.request_loader
+def load_user_from_request(request):
+    if config.config_allow_reverse_proxy_header_login:
+        rp_header_name = config.config_reverse_proxy_login_header_name
+        if rp_header_name:
+            rp_header_username = request.headers.get(rp_header_name)
+            if rp_header_username:
+                user = _fetch_user_by_name(rp_header_username)
+                if user:
+                    return user
+
+    auth_header = request.headers.get("Authorization")
+    if auth_header:
+        user = load_user_from_auth_header(auth_header)
+        if user:
+            return user
+
+    return
+
+
+def load_user_from_auth_header(header_val):
+    if header_val.startswith('Basic '):
+        header_val = header_val.replace('Basic ', '', 1)
+    basic_username = basic_password = ''
+    try:
+        header_val = base64.b64decode(header_val).decode('utf-8')
+        basic_username = header_val.split(':')[0]
+        basic_password = header_val.split(':')[1]
+    except (TypeError, UnicodeDecodeError, binascii.Error):
+        pass
+    user = _fetch_user_by_name(basic_username)
+    if user and config.config_login_type == constants.LOGIN_LDAP and services.ldap:
+        if services.ldap.bind_user(str(user.password), basic_password):
+            return user
+    if user and check_password_hash(str(user.password), basic_password):
+        return user
+    return
diff --git a/cps/web.py b/cps/web.py
index 1d37ce50..8a52f97a 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -22,46 +22,40 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
-import base64
 from datetime import datetime
 import json
 import mimetypes
-import traceback
-import binascii
-import re
+import chardet  # dependency of requests
 
 from babel.dates import format_date
 from babel import Locale as LC
 from babel.core import UnknownLocaleError
 from flask import Blueprint, jsonify
-from flask import render_template, request, redirect, send_from_directory, make_response, g, flash, abort, url_for
+from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for
 from flask import session as flask_session
 from flask_babel import gettext as _
-from flask_login import login_user, logout_user, login_required, current_user, confirm_login
+from flask_login import login_user, logout_user, login_required, current_user
 from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
-from sqlalchemy.sql.expression import text, func, true, false, not_, and_, or_
+from sqlalchemy.sql.expression import text, func, false, not_, and_
 from sqlalchemy.orm.attributes import flag_modified
-from werkzeug.exceptions import default_exceptions
 from sqlalchemy.sql.functions import coalesce
 
 from .services.worker import WorkerThread
 
-try:
-    from werkzeug.exceptions import FailedDependency
-except ImportError:
-    from werkzeug.exceptions import UnprocessableEntity as FailedDependency
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash, check_password_hash
 
 from . import constants, logger, isoLanguages, services
-from . import lm, babel, db, ub, config, get_locale, app
-from . import calibre_db
+from . import babel, db, ub, config, get_locale, app
+from . import calibre_db, shelf
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, \
     get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password
 from .pagination import Pagination
 from .redirect import redirect_back
+from .usermanagement import login_required_if_no_ano
+from .render_template import render_title_template
 
 feature_support = {
     'ldap': bool(services.ldap),
@@ -71,7 +65,6 @@ feature_support = {
 
 try:
     from .oauth_bb import oauth_check, register_user_with_oauth, logout_oauth_user, get_oauth_status
-
     feature_support['oauth'] = True
 except ImportError:
     feature_support['oauth'] = False
@@ -82,55 +75,12 @@ try:
 except ImportError:
     pass  # We're not using Python 3
 
-
 try:
     from natsort import natsorted as sort
 except ImportError:
     sort = sorted  # Just use regular sort then, may cause issues with badly named pages in cbz/cbr files
 
 
-# custom error page
-def error_http(error):
-    return render_template('http_error.html',
-                           error_code="Error {0}".format(error.code),
-                           error_name=error.name,
-                           issue=False,
-                           instance=config.config_calibre_web_title
-                           ), error.code
-
-
-def internal_error(error):
-    return render_template('http_error.html',
-                           error_code="Internal Server Error",
-                           error_name=str(error),
-                           issue=True,
-                           error_stack=traceback.format_exc().split("\n"),
-                           instance=config.config_calibre_web_title
-                           ), 500
-
-
-# http error handling
-for ex in default_exceptions:
-    if ex < 500:
-        app.register_error_handler(ex, error_http)
-    elif ex == 500:
-        app.register_error_handler(ex, internal_error)
-
-
-if feature_support['ldap']:
-    # Only way of catching the LDAPException upon logging in with LDAP server down
-    @app.errorhandler(services.ldap.LDAPException)
-    def handle_exception(e):
-        log.debug('LDAP server not accessible while trying to login to opds feed')
-        return error_http(FailedDependency())
-
-# @app.errorhandler(InvalidRequestError)
-#@app.errorhandler(OperationalError)
-#def handle_db_exception(e):
-#    db.session.rollback()
-#    log.error('Database request error: %s',e)
-#    return internal_error(InternalServerError(e))
-
 @app.after_request
 def add_security_headers(resp):
     # resp.headers['Content-Security-Policy']= "script-src 'self' https://www.googleapis.com https://api.douban.com https://comicvine.gamespot.com;"
@@ -146,104 +96,6 @@ log = logger.create()
 
 
 # ################################### Login logic and rights management ###############################################
-def _fetch_user_by_name(username):
-    return ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == username.lower()).first()
-
-
-@lm.user_loader
-def load_user(user_id):
-    return ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
-
-
-@lm.request_loader
-def load_user_from_request(request):
-    if config.config_allow_reverse_proxy_header_login:
-        rp_header_name = config.config_reverse_proxy_login_header_name
-        if rp_header_name:
-            rp_header_username = request.headers.get(rp_header_name)
-            if rp_header_username:
-                user = _fetch_user_by_name(rp_header_username)
-                if user:
-                    return user
-
-    auth_header = request.headers.get("Authorization")
-    if auth_header:
-        user = load_user_from_auth_header(auth_header)
-        if user:
-            return user
-
-    return
-
-
-def load_user_from_auth_header(header_val):
-    if header_val.startswith('Basic '):
-        header_val = header_val.replace('Basic ', '', 1)
-    basic_username = basic_password = ''
-    try:
-        header_val = base64.b64decode(header_val).decode('utf-8')
-        basic_username = header_val.split(':')[0]
-        basic_password = header_val.split(':')[1]
-    except (TypeError, UnicodeDecodeError, binascii.Error):
-        pass
-    user = _fetch_user_by_name(basic_username)
-    if user and config.config_login_type == constants.LOGIN_LDAP and services.ldap:
-        if services.ldap.bind_user(str(user.password), basic_password):
-            return user
-    if user and check_password_hash(str(user.password), basic_password):
-        return user
-    return
-
-
-def login_required_if_no_ano(func):
-    @wraps(func)
-    def decorated_view(*args, **kwargs):
-        if config.config_anonbrowse == 1:
-            return func(*args, **kwargs)
-        return login_required(func)(*args, **kwargs)
-
-    return decorated_view
-
-
-def remote_login_required(f):
-    @wraps(f)
-    def inner(*args, **kwargs):
-        if config.config_remote_login:
-            return f(*args, **kwargs)
-        if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
-            data = {'status': 'error', 'message': 'Forbidden'}
-            response = make_response(json.dumps(data, ensure_ascii=False))
-            response.headers["Content-Type"] = "application/json; charset=utf-8"
-            return response, 403
-        abort(403)
-
-    return inner
-
-
-def admin_required(f):
-    """
-    Checks if current_user.role == 1
-    """
-
-    @wraps(f)
-    def inner(*args, **kwargs):
-        if current_user.role_admin():
-            return f(*args, **kwargs)
-        abort(403)
-
-    return inner
-
-
-def unconfigured(f):
-    """
-    Checks if calibre-web instance is not configured
-    """
-    @wraps(f)
-    def inner(*args, **kwargs):
-        if not config.db_configured:
-            return f(*args, **kwargs)
-        abort(403)
-
-    return inner
 
 
 def download_required(f):
@@ -265,155 +117,6 @@ def viewer_required(f):
 
     return inner
 
-
-def upload_required(f):
-    @wraps(f)
-    def inner(*args, **kwargs):
-        if current_user.role_upload() or current_user.role_admin():
-            return f(*args, **kwargs)
-        abort(403)
-
-    return inner
-
-
-def edit_required(f):
-    @wraps(f)
-    def inner(*args, **kwargs):
-        if current_user.role_edit() or current_user.role_admin():
-            return f(*args, **kwargs)
-        abort(403)
-
-    return inner
-
-
-# ################################### Helper functions ################################################################
-
-
-@web.before_app_request
-def before_request():
-    if current_user.is_authenticated:
-        confirm_login()
-    g.constants = constants
-    g.user = current_user
-    g.allow_registration = config.config_public_reg
-    g.allow_anonymous = config.config_anonbrowse
-    g.allow_upload = config.config_uploading
-    g.current_theme = config.config_theme
-    g.config_authors_max = config.config_authors_max
-    g.shelves_access = ub.session.query(ub.Shelf).filter(
-        or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == current_user.id)).order_by(ub.Shelf.name).all()
-    if not config.db_configured and request.endpoint not in (
-        'admin.basic_configuration', 'login') and '/static/' not in request.path:
-        return redirect(url_for('admin.basic_configuration'))
-
-
-@app.route('/import_ldap_users')
-@login_required
-@admin_required
-def import_ldap_users():
-    showtext = {}
-    try:
-        new_users = services.ldap.get_group_members(config.config_ldap_group_name)
-    except (services.ldap.LDAPException, TypeError, AttributeError, KeyError) as e:
-        log.exception(e)
-        showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
-        return json.dumps(showtext)
-    if not new_users:
-        log.debug('LDAP empty response')
-        showtext['text'] = _(u'Error: No user returned in response of LDAP server')
-        return json.dumps(showtext)
-
-    imported = 0
-    for username in new_users:
-        user = username.decode('utf-8')
-        if '=' in user:
-            # if member object field is empty take user object as filter
-            if config.config_ldap_member_user_object:
-                query_filter = config.config_ldap_member_user_object
-            else:
-                query_filter = config.config_ldap_user_object
-            try:
-                user_identifier = extract_user_identifier(user, query_filter)
-            except Exception as e:
-                log.warning(e)
-                continue
-        else:
-            user_identifier = user
-            query_filter = None
-        try:
-            user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
-        except AttributeError as e:
-            log.exception(e)
-            continue
-        if user_data:
-            user_login_field = extract_dynamic_field_from_filter(user, config.config_ldap_user_object)
-
-            username = user_data[user_login_field][0].decode('utf-8')
-            # check for duplicate username
-            if ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == username.lower()).first():
-                # if ub.session.query(ub.User).filter(ub.User.nickname == username).first():
-                log.warning("LDAP User  %s Already in Database", user_data)
-                continue
-
-            kindlemail = ''
-            if 'mail' in user_data:
-                useremail = user_data['mail'][0].decode('utf-8')
-                if (len(user_data['mail']) > 1):
-                    kindlemail = user_data['mail'][1].decode('utf-8')
-
-            else:
-                log.debug('No Mail Field Found in LDAP Response')
-                useremail = username + '@email.com'
-            # check for duplicate email
-            if ub.session.query(ub.User).filter(func.lower(ub.User.email) == useremail.lower()).first():
-                log.warning("LDAP Email %s Already in Database", user_data)
-                continue
-            content = ub.User()
-            content.nickname = username
-            content.password = ''  # dummy password which will be replaced by ldap one
-            content.email = useremail
-            content.kindle_mail = kindlemail
-            content.role = config.config_default_role
-            content.sidebar_view = config.config_default_show
-            content.allowed_tags = config.config_allowed_tags
-            content.denied_tags = config.config_denied_tags
-            content.allowed_column_value = config.config_allowed_column_value
-            content.denied_column_value = config.config_denied_column_value
-            ub.session.add(content)
-            try:
-                ub.session.commit()
-                imported +=1
-            except Exception as e:
-                log.warning("Failed to create LDAP user: %s - %s", user, e)
-                ub.session.rollback()
-                showtext['text'] = _(u'Failed to Create at Least One LDAP User')
-        else:
-            log.warning("LDAP User: %s Not Found", user)
-            showtext['text'] = _(u'At Least One LDAP User Not Found in Database')
-    if not showtext:
-        showtext['text'] = _(u'{} User Successfully Imported'.format(imported))
-    return json.dumps(showtext)
-
-
-def extract_user_data_from_field(user, field):
-    match = re.search(field + "=([\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
-    if match:
-        return match.group(1)
-    else:
-        raise Exception("Could Not Parse LDAP User: {}".format(user))
-
-def extract_dynamic_field_from_filter(user, filter):
-    match = re.search("([a-zA-Z0-9-]+)=%s", filter, re.IGNORECASE | re.UNICODE)
-    if match:
-        return match.group(1)
-    else:
-        raise Exception("Could Not Parse LDAP Userfield: {}", user)
-
-def extract_user_identifier(user, filter):
-    dynamic_field = extract_dynamic_field_from_filter(user, filter)
-    return extract_user_data_from_field(user, dynamic_field)
-
-
 # ################################### data provider functions #########################################################
 
 
@@ -432,7 +135,10 @@ def bookmark(book_id, book_format):
                                               ub.Bookmark.book_id == book_id,
                                               ub.Bookmark.format == book_format)).delete()
     if not bookmark_key:
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
         return "", 204
 
     lbookmark = ub.Bookmark(user_id=current_user.id,
@@ -440,7 +146,10 @@ def bookmark(book_id, book_format):
                             format=book_format,
                             bookmark_key=bookmark_key)
     ub.session.merge(lbookmark)
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
     return "", 201
 
 
@@ -465,7 +174,10 @@ def toggle_read(book_id):
             kobo_reading_state.statistics = ub.KoboStatistics()
             book.kobo_reading_state = kobo_reading_state
         ub.session.merge(book)
-        ub.session.commit()
+        try:
+            ub.session.commit()
+        except OperationalError:
+            ub.session.rollback()
     else:
         try:
             calibre_db.update_title_sort(config)
@@ -499,7 +211,10 @@ def toggle_archived(book_id):
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
         archived_book.is_archived = True
     ub.session.merge(archived_book)
-    ub.session.commit()
+    try:
+        ub.session.commit()
+    except OperationalError:
+        ub.session.rollback()
     return ""
 
 
@@ -620,8 +335,6 @@ def get_matching_tags():
     title_input = request.args.get('book_title') or ''
     include_tag_inputs = request.args.getlist('include_tag') or ''
     exclude_tag_inputs = request.args.getlist('exclude_tag') or ''
-    # include_extension_inputs = request.args.getlist('include_extension') or ''
-    # exclude_extension_inputs = request.args.getlist('exclude_extension') or ''
     q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_input + "%")),
                  func.lower(db.Books.title).ilike("%" + title_input + "%"))
     if len(include_tag_inputs) > 0:
@@ -638,14 +351,6 @@ def get_matching_tags():
     return json_dumps
 
 
-# Returns the template for rendering and includes the instance name
-def render_title_template(*args, **kwargs):
-    sidebar = ub.get_sidebar_config(kwargs)
-    return render_template(instance=config.config_calibre_web_title, sidebar=sidebar,
-                           accept=constants.EXTENSIONS_UPLOAD,
-                           *args, **kwargs)
-
-
 def render_books_list(data, sort, book_id, page):
     order = [db.Books.timestamp.desc()]
     if sort == 'stored':
@@ -749,8 +454,6 @@ def render_hot_books(page):
                 entries.append(downloadBook)
             else:
                 ub.delete_download(book.Downloads.book_id)
-                # ub.session.query(ub.Downloads).filter(book.Downloads.book_id == ub.Downloads.book_id).delete()
-                # ub.session.commit()
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
@@ -905,7 +608,8 @@ def render_language_books(page, name, order):
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language")
 
-def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs):
+
+def render_read_books(page, are_read, as_xml=False, order=None):
     order = order or []
     if not config.config_read_column:
         if are_read:
@@ -917,7 +621,7 @@ def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs)
                                                                 db.Books,
                                                                 db_filter,
                                                                 order,
-                                                                ub.ReadBook, db.Books.id==ub.ReadBook.book_id)
+                                                                ub.ReadBook, db.Books.id == ub.ReadBook.book_id)
     else:
         try:
             if are_read:
@@ -1086,11 +790,12 @@ def update_table_settings():
         except AttributeError:
             pass
         ub.session.commit()
-    except InvalidRequestError:
+    except (InvalidRequestError, OperationalError):
         log.error("Invalid request received: %r ", request, )
         return "Invalid request", 400
     return ""
 
+
 @web.route("/author")
 @login_required_if_no_ano
 def author_list():
@@ -1323,6 +1028,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     rating_low = term.get("ratinghigh")
     rating_high = term.get("ratinglow")
     description = term.get("comment")
+    read_status = term.get("read_status")
     if author_name:
         author_name = author_name.strip().lower().replace(',', '|')
     if book_title:
@@ -1340,7 +1046,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     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:
+            include_extension_inputs or exclude_extension_inputs or read_status:
         searchterm.extend((author_name.replace('|', ','), book_title, publisher))
         if pub_start:
             try:
@@ -1358,8 +1064,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
                 pub_start = u""
         tag_names = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(include_tag_inputs)).all()
         searchterm.extend(tag.name for tag in tag_names)
+        tag_names = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(exclude_tag_inputs)).all()
+        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)
+        serie_names = calibre_db.session.query(db.Series).filter(db.Series.id.in_(exclude_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()
         if language_names:
@@ -1369,6 +1079,8 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             searchterm.extend([_(u"Rating <= %(rating)s", rating=rating_high)])
         if rating_low:
             searchterm.extend([_(u"Rating >= %(rating)s", rating=rating_low)])
+        if read_status:
+            searchterm.extend([_(u"Read Status = %(status)s", status=read_status)])
         searchterm.extend(ext for ext in include_extension_inputs)
         searchterm.extend(ext for ext in exclude_extension_inputs)
         # handle custom columns
@@ -1385,6 +1097,23 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             q = q.filter(db.Books.pubdate >= pub_start)
         if pub_end:
             q = q.filter(db.Books.pubdate <= pub_end)
+        if read_status:
+            if config.config_read_column:
+                if read_status=="True":
+                    q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
+                        .filter(db.cc_classes[config.config_read_column].value == True)
+                else:
+                    q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
+                        .filter(coalesce(db.cc_classes[config.config_read_column].value, False) != True)
+            else:
+                if read_status == "True":
+                    q = q.join(ub.ReadBook, db.Books.id==ub.ReadBook.book_id, isouter=True)\
+                        .filter(ub.ReadBook.user_id == int(current_user.id),
+                                ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED)
+                else:
+                    q = q.join(ub.ReadBook, db.Books.id == ub.ReadBook.book_id, isouter=True) \
+                        .filter(ub.ReadBook.user_id == int(current_user.id),
+                                coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED)
         if publisher:
             q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
         for tag in include_tag_inputs:
@@ -1487,8 +1216,14 @@ def serve_book(book_id, book_format, anyname):
         headers = Headers()
         headers["Content-Type"] = mimetypes.types_map.get('.' + book_format, "application/octet-stream")
         df = getFileFromEbooksFolder(book.path, data.name + "." + book_format)
-        return do_gdrive_download(df, headers)
+        return do_gdrive_download(df, headers, (book_format.upper() == 'TXT'))
     else:
+        if book_format.upper() == 'TXT':
+            rawdata = open(os.path.join(config.config_calibre_dir, book.path, data.name + "." + book_format),
+                           "rb").read()
+            result = chardet.detect(rawdata)
+            return make_response(
+                rawdata.decode(result['encoding']).encode('utf-8'))
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)
 
 
@@ -1674,89 +1409,7 @@ def logout():
     return redirect(url_for('web.login'))
 
 
-@web.route('/remote/login')
-@remote_login_required
-def remote_login():
-    auth_token = ub.RemoteAuthToken()
-    ub.session.add(auth_token)
-    ub.session.commit()
 
-    verify_url = url_for('web.verify_token', token=auth_token.auth_token, _external=true)
-    log.debug(u"Remot Login request with token: %s", auth_token.auth_token)
-    return render_title_template('remote_login.html', title=_(u"login"), token=auth_token.auth_token,
-                                 verify_url=verify_url, page="remotelogin")
-
-
-@web.route('/verify/<token>')
-@remote_login_required
-@login_required
-def verify_token(token):
-    auth_token = ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.auth_token == token).first()
-
-    # Token not found
-    if auth_token is None:
-        flash(_(u"Token not found"), category="error")
-        log.error(u"Remote Login token not found")
-        return redirect(url_for('web.index'))
-
-    # Token expired
-    if datetime.now() > auth_token.expiration:
-        ub.session.delete(auth_token)
-        ub.session.commit()
-
-        flash(_(u"Token has expired"), category="error")
-        log.error(u"Remote Login token expired")
-        return redirect(url_for('web.index'))
-
-    # Update token with user information
-    auth_token.user_id = current_user.id
-    auth_token.verified = True
-    ub.session.commit()
-
-    flash(_(u"Success! Please return to your device"), category="success")
-    log.debug(u"Remote Login token for userid %s verified", auth_token.user_id)
-    return redirect(url_for('web.index'))
-
-
-@web.route('/ajax/verify_token', methods=['POST'])
-@remote_login_required
-def token_verified():
-    token = request.form['token']
-    auth_token = ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.auth_token == token).first()
-
-    data = {}
-
-    # Token not found
-    if auth_token is None:
-        data['status'] = 'error'
-        data['message'] = _(u"Token not found")
-
-    # Token expired
-    elif datetime.now() > auth_token.expiration:
-        ub.session.delete(auth_token)
-        ub.session.commit()
-
-        data['status'] = 'error'
-        data['message'] = _(u"Token has expired")
-
-    elif not auth_token.verified:
-        data['status'] = 'not_verified'
-
-    else:
-        user = ub.session.query(ub.User).filter(ub.User.id == auth_token.user_id).first()
-        login_user(user)
-
-        ub.session.delete(auth_token)
-        ub.session.commit()
-
-        data['status'] = 'success'
-        log.debug(u"Remote Login for userid %s succeded", user.id)
-        flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
-
-    response = make_response(json.dumps(data, ensure_ascii=False))
-    response.headers["Content-Type"] = "application/json; charset=utf-8"
-
-    return response
 
 
 # ################################### Users own configuration #########################################################
@@ -1839,14 +1492,11 @@ def profile():
             ub.session.rollback()
             flash(_(u"Found an existing account for this e-mail address."), category="error")
             log.debug(u"Found an existing account for this e-mail address.")
-            '''return render_title_template("user_edit.html",
-                                         content=current_user,
-                                         translations=translations,
-                                         kobo_support=kobo_support,
-                                         title=_(u"%(name)s's profile", name=current_user.nickname),
-                                         page="me",
-                                         registered_oauth=local_oauth_check,
-                                         oauth_status=oauth_status)'''
+        except OperationalError as e:
+            ub.session.rollback()
+            log.error("Database error: %s", e)
+            flash(_(u"Database error: %(error)s.", error=e), category="error")
+
     return render_title_template("user_edit.html",
                                  translations=translations,
                                  profile=1,
@@ -1900,14 +1550,6 @@ def read_book(book_id, book_format):
                 log.debug(u"Start comic reader for %d", book_id)
                 return render_title_template('readcbr.html', comicfile=all_name, title=_(u"Read a Book"),
                                              extension=fileExt)
-        # if feature_support['rar']:
-        #    extensionList = ["cbr","cbt","cbz"]
-        # else:
-        #     extensionList = ["cbt","cbz"]
-        # for fileext in extensionList:
-        #     if book_format.lower() == fileext:
-        #         return render_title_template('readcbr.html', comicfile=book_id,
-        #         extension=fileext, title=_(u"Read a Book"), book=book)
         log.debug(u"Error opening eBook. File does not exist or file is not accessible")
         flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error")
         return redirect(url_for("web.index"))
diff --git a/messages.pot b/messages.pot
index 3a5d7fc8..88b8aace 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-12-12 10:05+0100\n"
+"POT-Creation-Date: 2021-01-02 19:37+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"
@@ -29,276 +29,313 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:94
+#: cps/admin.py:144
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:96
+#: cps/admin.py:146
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:104
+#: cps/admin.py:154
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:107
+#: cps/admin.py:157
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:117 cps/editbooks.py:611 cps/editbooks.py:623
-#: cps/editbooks.py:726 cps/editbooks.py:728 cps/editbooks.py:789
-#: cps/editbooks.py:805 cps/updater.py:510 cps/uploader.py:98
-#: cps/uploader.py:108
+#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
+#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
+#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/uploader.py:100
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:138
+#: cps/admin.py:188
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:160
+#: cps/admin.py:210
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:192 cps/admin.py:745
+#: cps/admin.py:242 cps/admin.py:954
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/admin.py:253
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
+#: cps/admin.py:255
+msgid "Do you really want to delete this domain?"
+msgstr ""
+
+#: cps/admin.py:257
+msgid "Do you really want to delete this user?"
+msgstr ""
+
+#: cps/admin.py:259 cps/templates/shelf.html:90
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:510
+#: cps/admin.py:713
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:550
+#: cps/admin.py:753
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:556
+#: cps/admin.py:759
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:585
+#: cps/admin.py:788
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:600
+#: cps/admin.py:803
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:603
+#: cps/admin.py:806
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:811
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:611
+#: cps/admin.py:814
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:619
+#: cps/admin.py:822
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:622
+#: cps/admin.py:825
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:630
+#: cps/admin.py:833
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:859
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:660
+#: cps/admin.py:865
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:728 cps/admin.py:827 cps/admin.py:917 cps/admin.py:966
-#: 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
+#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
+#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:740
+#: cps/admin.py:947
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:742
+#: cps/admin.py:951
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:984
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:790 cps/web.py:1552
+#: cps/admin.py:999 cps/web.py:1287
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:793 cps/admin.py:805 cps/admin.py:811 cps/admin.py:935
+#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:802 cps/web.py:1798
+#: cps/admin.py:1011 cps/web.py:1451
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:809 cps/admin.py:824
+#: cps/admin.py:1018 cps/admin.py:1036
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:820
+#: cps/admin.py:1032
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:836
+#: cps/admin.py:1051
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:839
+#: cps/admin.py:1054
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:845
+#: cps/admin.py:1060
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:881 cps/web.py:1840
+#: cps/admin.py:1096 cps/web.py:1493
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:890 cps/admin.py:904 cps/admin.py:1007 cps/web.py:1816
+#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:896 cps/web.py:1809
+#: cps/admin.py:1111 cps/web.py:1462
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:911
+#: cps/admin.py:1129
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:914
+#: cps/admin.py:1132
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/admin.py:944
+#: cps/admin.py:1162 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:973
+#: cps/admin.py:1191
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:976
+#: cps/admin.py:1194
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:978
+#: cps/admin.py:1196
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:980
+#: cps/admin.py:1198
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:991
+#: cps/admin.py:1209
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1018
+#: cps/admin.py:1236
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1021 cps/web.py:1576 cps/web.py:1640
+#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1024 cps/web.py:1514
+#: cps/admin.py:1242 cps/web.py:1249
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1036
+#: cps/admin.py:1254
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1097
+#: cps/admin.py:1315
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1098
+#: cps/admin.py:1316
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1099
+#: cps/admin.py:1317
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1100
+#: cps/admin.py:1318
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1101
+#: cps/admin.py:1319
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1102
+#: cps/admin.py:1320
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1103
+#: cps/admin.py:1321
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1104 cps/admin.py:1105 cps/admin.py:1106 cps/admin.py:1107
-#: cps/admin.py:1108
+#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
+#: cps/admin.py:1326
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1104 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1105 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1106 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1107 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1108
+#: cps/admin.py:1326
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
+#: cps/admin.py:1351
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1355
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1421
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1424
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1426
+msgid "{} User Successfully Imported"
+msgstr ""
+
 #: cps/converter.py:31
 msgid "not configured"
 msgstr ""
@@ -307,98 +344,98 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/editbooks.py:272 cps/editbooks.py:274
+#: cps/editbooks.py:297 cps/editbooks.py:299
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:281 cps/editbooks.py:283
+#: cps/editbooks.py:306 cps/editbooks.py:308
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:292 cps/editbooks.py:595 cps/web.py:1871 cps/web.py:1912
-#: cps/web.py:1983
+#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
+#: cps/web.py:1625
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:326
+#: cps/editbooks.py:351
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:401
+#: cps/editbooks.py:426
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:512 cps/editbooks.py:771
+#: cps/editbooks.py:537 cps/editbooks.py:796
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:516 cps/editbooks.py:775
+#: cps/editbooks.py:541 cps/editbooks.py:800
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:528
+#: cps/editbooks.py:553
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:533
+#: cps/editbooks.py:558
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:551 cps/editbooks.py:906
+#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:555
+#: cps/editbooks.py:580
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:675
+#: cps/editbooks.py:700
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:712
+#: cps/editbooks.py:737
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:721
+#: cps/editbooks.py:746
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:783
+#: cps/editbooks.py:808
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:793
+#: cps/editbooks.py:818
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:881
+#: cps/editbooks.py:906
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:892
+#: cps/editbooks.py:917
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:918
+#: cps/editbooks.py:943
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:926
+#: cps/editbooks.py:951
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:930
+#: cps/editbooks.py:955
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -407,456 +444,469 @@ msgstr ""
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr ""
 
-#: cps/gdrive.py:101
+#: cps/gdrive.py:97
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:82
+#: cps/helper.py:79
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:88 cps/tasks/convert.py:50
+#: cps/helper.py:85 cps/tasks/convert.py:52
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:93
+#: cps/helper.py:90
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:98 cps/helper.py:231 cps/templates/detail.html:41
+#: 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:99 cps/helper.py:115 cps/helper.py:233
+#: 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:113
+#: cps/helper.py:110
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:114
+#: cps/helper.py:111
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:131
+#: cps/helper.py:128
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:136
+#: cps/helper.py:133
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:156 cps/helper.py:160 cps/helper.py:164 cps/helper.py:173
-#: cps/helper.py:177 cps/helper.py:181
+#: 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:186 cps/helper.py:192
+#: 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:233
+#: cps/helper.py:230
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr ""
 
-#: cps/helper.py:235
+#: cps/helper.py:232
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:332
+#: cps/helper.py:329
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:338
+#: cps/helper.py:335
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:348
+#: cps/helper.py:345
 #, python-format
 msgid "Deleting book %(id)s, book path not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:418
+#: 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:443 cps/helper.py:453 cps/helper.py:461
+#: 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:482
+#: cps/helper.py:479
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:594
+#: cps/helper.py:590
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:609
+#: cps/helper.py:604
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:614
+#: cps/helper.py:609
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:625
-msgid "Only jpg/jpeg/png/webp files are supported as coverfile"
+#: cps/helper.py:620
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:639
+#: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:687
+#: cps/helper.py:684
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:701
+#: cps/helper.py:698
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:750
+#: cps/helper.py:747
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:752
+#: cps/helper.py:749
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:754
+#: cps/helper.py:751
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:756
+#: cps/helper.py:753
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:758
+#: cps/helper.py:755
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:130
+#: cps/kobo_auth.py:131
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:73
+#: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:154
+#: cps/oauth_bb.py:158
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:159
+#: cps/oauth_bb.py:163
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:170
+#: cps/oauth_bb.py:174
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:175
+#: cps/oauth_bb.py:179
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:225 cps/web.py:1612 cps/web.py:1754
+#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/oauth_bb.py:235
+#: cps/oauth_bb.py:239
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:241
+#: cps/oauth_bb.py:245
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:283
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
-
 #: cps/oauth_bb.py:287
 #, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr ""
+
+#: cps/oauth_bb.py:291
+#, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:290
+#: cps/oauth_bb.py:294
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:318
+#: cps/oauth_bb.py:322
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:337
+#: cps/oauth_bb.py:341
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/shelf.py:67 cps/shelf.py:120
+#: cps/remotelogin.py:66 cps/web.py:1394
+msgid "login"
+msgstr ""
+
+#: cps/remotelogin.py:78 cps/remotelogin.py:112
+msgid "Token not found"
+msgstr ""
+
+#: cps/remotelogin.py:87 cps/remotelogin.py:120
+msgid "Token has expired"
+msgstr ""
+
+#: cps/remotelogin.py:96
+msgid "Success! Please return to your device"
+msgstr ""
+
+#: cps/render_template.py:39
+msgid "Recently Added"
+msgstr ""
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr ""
+
+#: cps/render_template.py:42 cps/templates/index.xml:17
+msgid "Hot Books"
+msgstr ""
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr ""
+
+#: cps/render_template.py:45
+msgid "Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:47
+msgid "Show Downloaded Books"
+msgstr ""
+
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+msgid "Top Rated Books"
+msgstr ""
+
+#: cps/render_template.py:52
+msgid "Show Top Rated Books"
+msgstr ""
+
+#: cps/render_template.py:53 cps/templates/index.xml:46
+#: cps/templates/index.xml:50 cps/web.py:648
+msgid "Read Books"
+msgstr ""
+
+#: cps/render_template.py:55
+msgid "Show read and unread"
+msgstr ""
+
+#: cps/render_template.py:57 cps/templates/index.xml:53
+#: cps/templates/index.xml:57 cps/web.py:651
+msgid "Unread Books"
+msgstr ""
+
+#: cps/render_template.py:59
+msgid "Show unread"
+msgstr ""
+
+#: cps/render_template.py:60
+msgid "Discover"
+msgstr ""
+
+#: cps/render_template.py:62
+msgid "Show random books"
+msgstr ""
+
+#: cps/render_template.py:63 cps/templates/book_table.html:50
+#: cps/templates/index.xml:75 cps/web.py:953
+msgid "Categories"
+msgstr ""
+
+#: cps/render_template.py:65
+msgid "Show category selection"
+msgstr ""
+
+#: cps/render_template.py:66 cps/templates/book_edit.html:84
+#: cps/templates/book_table.html:51 cps/templates/index.xml:82
+#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+msgid "Series"
+msgstr ""
+
+#: cps/render_template.py:68
+msgid "Show series selection"
+msgstr ""
+
+#: cps/render_template.py:69 cps/templates/book_table.html:49
+#: cps/templates/index.xml:61
+msgid "Authors"
+msgstr ""
+
+#: cps/render_template.py:71
+msgid "Show author selection"
+msgstr ""
+
+#: cps/render_template.py:73 cps/templates/book_table.html:55
+#: cps/templates/index.xml:68 cps/web.py:836
+msgid "Publishers"
+msgstr ""
+
+#: cps/render_template.py:75
+msgid "Show publisher selection"
+msgstr ""
+
+#: cps/render_template.py:76 cps/templates/book_table.html:53
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+msgid "Languages"
+msgstr ""
+
+#: cps/render_template.py:79
+msgid "Show language selection"
+msgstr ""
+
+#: cps/render_template.py:80 cps/templates/index.xml:96
+msgid "Ratings"
+msgstr ""
+
+#: cps/render_template.py:82
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/render_template.py:83 cps/templates/index.xml:104
+msgid "File formats"
+msgstr ""
+
+#: cps/render_template.py:85
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/render_template.py:87 cps/web.py:675
+msgid "Archived Books"
+msgstr ""
+
+#: cps/render_template.py:89
+msgid "Show archived books"
+msgstr ""
+
+#: cps/render_template.py:91 cps/web.py:746
+msgid "Books List"
+msgstr ""
+
+#: cps/render_template.py:93
+msgid "Show Books List"
+msgstr ""
+
+#: cps/shelf.py:69 cps/shelf.py:122
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/shelf.py:73
+#: cps/shelf.py:75
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/shelf.py:83
+#: cps/shelf.py:85
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/shelf.py:106
+#: cps/shelf.py:108
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:124
+#: cps/shelf.py:126
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/shelf.py:142
+#: cps/shelf.py:144
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/shelf.py:158
+#: cps/shelf.py:156
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:163
+#: cps/shelf.py:161
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:208
+#: cps/shelf.py:206
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:216
+#: cps/shelf.py:214
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:240 cps/shelf.py:284
+#: cps/shelf.py:238 cps/shelf.py:282
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:249 cps/shelf.py:294
+#: cps/shelf.py:247 cps/shelf.py:292
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:256
+#: cps/shelf.py:254
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:263 cps/shelf.py:312
+#: cps/shelf.py:261 cps/shelf.py:310
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:264 cps/shelf.py:266 cps/templates/layout.html:140
+#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/shelf.py:306
+#: cps/shelf.py:304
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:313 cps/shelf.py:315
+#: cps/shelf.py:311 cps/shelf.py:313
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:369
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr ""
-
-#: 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
+#: cps/shelf.py:381
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/ub.py:68
-msgid "Recently Added"
+#: cps/shelf.py:447
+#, python-format
+msgid "Shelf: '%(name)s'"
 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:683
-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:944
-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:947
-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:1248
-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:1152 cps/web.py:1162
-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:1131
-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:1227
-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:971
-msgid "Archived Books"
-msgstr ""
-
-#: cps/ub.py:118
-msgid "Show archived books"
-msgstr ""
-
-#: cps/ub.py:120 cps/web.py:1042
-msgid "Books List"
-msgstr ""
-
-#: cps/ub.py:122
-msgid "Show Books List"
+#: cps/shelf.py:451
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
 #: cps/updater.py:295 cps/updater.py:306 cps/updater.py:407 cps/updater.py:421
@@ -888,254 +938,222 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:319
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/web.py:323
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/web.py:389
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/web.py:392
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/web.py:394
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/templates/index.html:5 cps/web.py:691
+#: cps/templates/index.html:5 cps/web.py:396
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:730
+#: cps/web.py:435
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:757
+#: cps/web.py:460
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:792
+#: cps/web.py:495
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:806
+#: cps/web.py:509
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:820
+#: cps/web.py:523
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:834
+#: cps/web.py:537
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:847
+#: cps/web.py:550
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:860
+#: cps/web.py:563
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:873
+#: cps/web.py:576
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:887
+#: cps/web.py:590
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:906
+#: cps/web.py:609
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/web.py:935
+#: cps/web.py:639
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:1002 cps/web.py:1451
+#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
 msgid "Advanced Search"
 msgstr ""
 
-#: cps/templates/book_edit.html:213 cps/templates/feed.xml:33
+#: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:1014 cps/web.py:1285
+#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
 msgid "Search"
 msgstr ""
 
-#: cps/web.py:1180
+#: cps/web.py:885
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:904
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:1262
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1347
+#: cps/web.py:1053
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1354
+#: cps/web.py:1060
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1369
+#: cps/web.py:1079
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1081
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1519
+#: cps/web.py:1083
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr ""
+
+#: cps/web.py:1254
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1258
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1525
+#: cps/web.py:1260
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1277
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1543 cps/web.py:1553 cps/web.py:1577 cps/web.py:1581
-#: cps/web.py:1586 cps/web.py:1590
+#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
+#: cps/web.py:1321 cps/web.py:1325
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1579
+#: cps/web.py:1314
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1317
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1585
+#: cps/web.py:1320
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1602
+#: cps/web.py:1337
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1619
+#: cps/web.py:1354
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1625
+#: cps/web.py:1360
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1629 cps/web.py:1653
+#: cps/web.py:1364 cps/web.py:1388
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1636
+#: cps/web.py:1371
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1642
+#: cps/web.py:1377
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1648
+#: cps/web.py:1383
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1659 cps/web.py:1686
-msgid "login"
-msgstr ""
-
-#: cps/web.py:1698 cps/web.py:1732
-msgid "Token not found"
-msgstr ""
-
-#: cps/web.py:1707 cps/web.py:1740
-msgid "Token has expired"
-msgstr ""
-
-#: cps/web.py:1716
-msgid "Success! Please return to your device"
-msgstr ""
-
-#: cps/web.py:1800 cps/web.py:1856
+#: cps/web.py:1453 cps/web.py:1506
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1836
+#: cps/web.py:1489
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1883 cps/web.py:1886 cps/web.py:1889 cps/web.py:1896
-#: cps/web.py:1901
+#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
+#: cps/web.py:1551
 msgid "Read a Book"
 msgstr ""
 
-#: cps/tasks/convert.py:103
+#: cps/tasks/convert.py:108
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:127
+#: cps/tasks/convert.py:132
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:130
+#: cps/tasks/convert.py:136
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:140
+#: cps/tasks/convert.py:146
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:164
+#: cps/tasks/convert.py:170
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:187
+#: cps/tasks/convert.py:193
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:212
+#: cps/tasks/convert.py:218
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1178,7 +1196,6 @@ 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 ""
 
@@ -1191,9 +1208,8 @@ 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
+#: cps/templates/book_table.html:57 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:66
 msgid "Delete"
 msgstr ""
 
@@ -1233,10 +1249,6 @@ msgstr ""
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:78 cps/templates/admin.html:137
-msgid "Edit Basic Configuration"
-msgstr ""
-
 #: cps/templates/admin.html:84
 msgid "Configuration"
 msgstr ""
@@ -1245,7 +1257,7 @@ msgstr ""
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:91 cps/templates/config_edit.html:129
+#: cps/templates/admin.html:91 cps/templates/config_edit.html:136
 msgid "Log Level"
 msgstr ""
 
@@ -1285,6 +1297,10 @@ msgstr ""
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:137
+msgid "Edit Basic Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:138
 msgid "Edit UI Configuration"
 msgstr ""
@@ -1342,16 +1358,17 @@ msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:190 cps/templates/admin.html:204
-#: cps/templates/admin.html:224 cps/templates/shelf.html:80
+#: cps/templates/admin.html:224 cps/templates/shelf.html:95
 msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:191 cps/templates/admin.html:205
 #: cps/templates/book_edit.html:192 cps/templates/book_table.html:84
-#: cps/templates/config_edit.html:422 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
+#: cps/templates/config_edit.html:427 cps/templates/config_view_edit.html:151
+#: cps/templates/email_edit.html:47 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/shelf.html:96 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:132
 msgid "Cancel"
 msgstr ""
 
@@ -1371,44 +1388,44 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:26 cps/templates/index.html:65
-#: cps/templates/search.html:29
+#: cps/templates/author.html:26 cps/templates/index.html:68
+#: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:66
-#: cps/templates/search.html:30
+#: cps/templates/author.html:27 cps/templates/index.html:69
+#: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:67
-#: cps/templates/search.html:31
+#: cps/templates/author.html:28 cps/templates/index.html:70
+#: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:68
-#: cps/templates/search.html:32
+#: cps/templates/author.html:29 cps/templates/index.html:71
+#: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:71
-#: cps/templates/search.html:35
+#: cps/templates/author.html:30 cps/templates/index.html:74
+#: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:72
-#: cps/templates/search.html:36
+#: cps/templates/author.html:31 cps/templates/index.html:75
+#: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:54 cps/templates/author.html:114
-#: cps/templates/discover.html:27 cps/templates/index.html:26
-#: cps/templates/index.html:100 cps/templates/search.html:62
-#: cps/templates/shelf.html:36
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:106 cps/templates/search.html:65
+#: cps/templates/shelf.html:51
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:98
+#: cps/templates/author.html:101
 msgid "More by"
 msgstr ""
 
@@ -1444,13 +1461,13 @@ msgstr ""
 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
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:276 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
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:263
+#: cps/templates/book_edit.html:278 cps/templates/search_form.html:127
 msgid "Description"
 msgstr ""
 
@@ -1458,15 +1475,15 @@ msgstr ""
 msgid "Identifiers"
 msgstr ""
 
-#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:286
+#: cps/templates/book_edit.html:70 cps/templates/book_edit.html:287
 msgid "Identifier Type"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:287
+#: cps/templates/book_edit.html:71 cps/templates/book_edit.html:288
 msgid "Identifier Value"
 msgstr ""
 
-#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:288
+#: cps/templates/book_edit.html:72 cps/templates/book_edit.html:289
 msgid "Remove"
 msgstr ""
 
@@ -1474,7 +1491,7 @@ msgstr ""
 msgid "Add Identifier"
 msgstr ""
 
-#: cps/templates/book_edit.html:80 cps/templates/search_form.html:34
+#: cps/templates/book_edit.html:80 cps/templates/search_form.html:44
 msgid "Tags"
 msgstr ""
 
@@ -1498,8 +1515,8 @@ msgstr ""
 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/book_edit.html:116 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:277 cps/templates/detail.html:156
 #: cps/templates/search_form.html:15
 msgid "Publisher"
 msgstr ""
@@ -1509,11 +1526,13 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:130 cps/templates/search_form.html:138
+#: cps/templates/book_edit.html:130 cps/templates/search_form.html:38
+#: cps/templates/search_form.html:138
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:131 cps/templates/search_form.html:139
+#: cps/templates/book_edit.html:131 cps/templates/search_form.html:39
+#: cps/templates/search_form.html:139
 msgid "No"
 msgstr ""
 
@@ -1525,47 +1544,48 @@ msgstr ""
 msgid "View Book on Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:207
+#: cps/templates/book_edit.html:190 cps/templates/book_edit.html:208
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:419
+#: cps/templates/book_edit.html:191 cps/templates/config_edit.html:424
 #: 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
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:40
+#: cps/templates/user_edit.html:130
 msgid "Save"
 msgstr ""
 
-#: cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:211
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr ""
 
-#: cps/templates/book_edit.html:217
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:233 cps/templates/book_edit.html:273
 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
+#: cps/templates/book_edit.html:238 cps/templates/layout.html:186
+#: cps/templates/layout.html:208 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:150
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:265 cps/templates/book_edit.html:279
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:274
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:275
 msgid "No Result(s) found! Please try another keyword."
 msgstr ""
 
@@ -1670,303 +1690,307 @@ msgstr ""
 msgid "Location of Calibre Database"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:29
+msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
+msgstr ""
+
+#: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
 msgstr ""
 
-#: cps/templates/config_edit.html:34
+#: cps/templates/config_edit.html:41
 msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:40
+#: cps/templates/config_edit.html:47
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:44
+#: cps/templates/config_edit.html:51
 msgid "Please hit save to continue with setup"
 msgstr ""
 
-#: cps/templates/config_edit.html:47
+#: cps/templates/config_edit.html:54
 msgid "Please finish Google Drive setup after login"
 msgstr ""
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:59
 msgid "Google Drive Calibre folder"
 msgstr ""
 
-#: cps/templates/config_edit.html:60
+#: cps/templates/config_edit.html:67
 msgid "Metadata Watch Channel ID"
 msgstr ""
 
-#: cps/templates/config_edit.html:63
+#: cps/templates/config_edit.html:70
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:83
+#: cps/templates/config_edit.html:90
 msgid "Server Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:100
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:107
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:108
+#: cps/templates/config_edit.html:115
 msgid "Update Channel"
 msgstr ""
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:117
 msgid "Stable"
 msgstr ""
 
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:118
 msgid "Nightly"
 msgstr ""
 
-#: cps/templates/config_edit.html:122
+#: cps/templates/config_edit.html:129
 msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:138
+#: cps/templates/config_edit.html:145
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:143
+#: cps/templates/config_edit.html:150
 msgid "Enable Access Log"
 msgstr ""
 
-#: cps/templates/config_edit.html:146
+#: cps/templates/config_edit.html:153
 msgid "Location and name of access logfile (access.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:157
+#: cps/templates/config_edit.html:164
 msgid "Feature Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:165
+#: cps/templates/config_edit.html:172
 msgid "Enable Uploads"
 msgstr ""
 
-#: cps/templates/config_edit.html:169
+#: cps/templates/config_edit.html:176
 msgid "Allowed Upload Fileformats"
 msgstr ""
 
-#: cps/templates/config_edit.html:175
+#: cps/templates/config_edit.html:182
 msgid "Enable Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:179
+#: cps/templates/config_edit.html:186
 msgid "Enable Public Registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:191
 msgid "Use E-Mail as Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:189
+#: cps/templates/config_edit.html:196
 msgid "Enable Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/config_edit.html:194
+#: cps/templates/config_edit.html:201
 msgid "Enable Kobo sync"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:206
 msgid "Proxy unknown requests to Kobo Store"
 msgstr ""
 
-#: cps/templates/config_edit.html:202
+#: cps/templates/config_edit.html:209
 msgid "Server External Port (for port forwarded API calls)"
 msgstr ""
 
-#: cps/templates/config_edit.html:210
+#: cps/templates/config_edit.html:217
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:211
+#: cps/templates/config_edit.html:218
 msgid "Create an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:215
+#: cps/templates/config_edit.html:222
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:219
+#: cps/templates/config_edit.html:226
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
+#: cps/templates/config_edit.html:233
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
+#: cps/templates/config_edit.html:237
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:244
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:239
+#: cps/templates/config_edit.html:246
 msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:248
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:244
+#: cps/templates/config_edit.html:251
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:251
+#: cps/templates/config_edit.html:258
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:255
+#: cps/templates/config_edit.html:262
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:259
+#: cps/templates/config_edit.html:266
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:261 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:268 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr ""
 
-#: cps/templates/config_edit.html:262
+#: cps/templates/config_edit.html:269
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:270
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:274
+#: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:299
 msgid "Anonymous"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:300
 msgid "Unauthenticated"
 msgstr ""
 
-#: cps/templates/config_edit.html:294
+#: cps/templates/config_edit.html:301
 msgid "Simple"
 msgstr ""
 
-#: cps/templates/config_edit.html:299
+#: cps/templates/config_edit.html:306
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:305
+#: cps/templates/config_edit.html:312
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:310
+#: cps/templates/config_edit.html:317
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:314
+#: cps/templates/config_edit.html:321
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:319
+#: cps/templates/config_edit.html:326
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:328
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:330
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:327
+#: cps/templates/config_edit.html:334
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:331
+#: cps/templates/config_edit.html:338
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:335
+#: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
 msgstr ""
 
-#: cps/templates/config_edit.html:337
+#: cps/templates/config_edit.html:344
 msgid "Autodetect"
 msgstr ""
 
-#: cps/templates/config_edit.html:338
+#: cps/templates/config_edit.html:345
 msgid "Custom Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:343
+#: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:354
-#, python-format
-msgid "Obtain %(provider)s OAuth Credential"
-msgstr ""
-
-#: cps/templates/config_edit.html:357
-#, python-format
-msgid "%(provider)s OAuth Client Id"
-msgstr ""
-
 #: cps/templates/config_edit.html:361
 #, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:364
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:368
+#, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:377
+#: cps/templates/config_edit.html:384
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:383
+#: cps/templates/config_edit.html:390
 msgid "Path to Calibre E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:391
+#: cps/templates/config_edit.html:398
 msgid "Calibre E-Book Converter Settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:394
+#: cps/templates/config_edit.html:401
 msgid "Path to Kepubify E-Book Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:402
+#: cps/templates/config_edit.html:409
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:425 cps/templates/layout.html:85
+#: cps/templates/config_edit.html:430 cps/templates/layout.html:85
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr ""
@@ -2165,10 +2189,6 @@ msgstr ""
 msgid "Denied Domains (Blacklist)"
 msgstr ""
 
-#: cps/templates/email_edit.html:99
-msgid "Are you sure you want to delete this domain?"
-msgstr ""
-
 #: cps/templates/feed.xml:21 cps/templates/layout.html:170
 msgid "Next"
 msgstr ""
@@ -2189,19 +2209,21 @@ msgstr ""
 msgid "Return to Home"
 msgstr ""
 
-#: cps/templates/index.html:69 cps/templates/search.html:33
+#: cps/templates/index.html:72 cps/templates/search.html:33
+#: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:70 cps/templates/search.html:34
+#: cps/templates/index.html:73 cps/templates/search.html:34
+#: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:74
+#: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:75
+#: cps/templates/index.html:78
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2273,8 +2295,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: cps/templates/layout.html:29 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:168
+#: cps/templates/layout.html:29 cps/templates/shelf_order.html:41
 msgid "Back"
 msgstr ""
 
@@ -2303,7 +2324,7 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: cps/templates/layout.html:117 cps/templates/layout.html:216
+#: cps/templates/layout.html:117 cps/templates/layout.html:207
 msgid "Uploading..."
 msgstr ""
 
@@ -2327,11 +2348,11 @@ msgstr ""
 msgid "Book Details"
 msgstr ""
 
-#: cps/templates/layout.html:215
+#: cps/templates/layout.html:206
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:218
+#: cps/templates/layout.html:209
 msgid "Error"
 msgstr ""
 
@@ -2415,6 +2436,30 @@ msgstr ""
 msgid "Books must first be archived and the device synced before a book can safely be deleted."
 msgstr ""
 
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr ""
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr ""
+
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
 msgstr ""
@@ -2575,23 +2620,27 @@ msgstr ""
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:44
+#: cps/templates/search_form.html:35
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/search_form.html:52
 msgid "Exclude Tags"
 msgstr ""
 
-#: cps/templates/search_form.html:64
+#: cps/templates/search_form.html:70
 msgid "Exclude Series"
 msgstr ""
 
-#: cps/templates/search_form.html:85
+#: cps/templates/search_form.html:89
 msgid "Exclude Languages"
 msgstr ""
 
-#: cps/templates/search_form.html:96
+#: cps/templates/search_form.html:100
 msgid "Extensions"
 msgstr ""
 
-#: cps/templates/search_form.html:106
+#: cps/templates/search_form.html:108
 msgid "Exclude Extensions"
 msgstr ""
 
@@ -2608,18 +2657,22 @@ msgid "Delete this Shelf"
 msgstr ""
 
 #: cps/templates/shelf.html:11
-msgid "Edit Shelf"
+msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
-msgid "Change order"
+#: cps/templates/shelf.html:13
+msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:75
-msgid "Are you sure you want to delete this shelf?"
+#: cps/templates/shelf.html:14
+msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:78
+#: cps/templates/shelf.html:14
+msgid "Enable Change order"
+msgstr ""
+
+#: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
 msgstr ""
 
@@ -2631,6 +2684,10 @@ msgstr ""
 msgid "Drag to Rearrange Order"
 msgstr ""
 
+#: cps/templates/shelf_order.html:32
+msgid "Hidden Book"
+msgstr ""
+
 #: cps/templates/stats.html:7
 msgid "Library Statistics"
 msgstr ""
@@ -2731,15 +2788,11 @@ msgstr ""
 msgid "Add allowed/Denied Custom Column Values"
 msgstr ""
 
-#: cps/templates/user_edit.html:131
+#: cps/templates/user_edit.html:135
 msgid "Delete User"
 msgstr ""
 
-#: cps/templates/user_edit.html:150
+#: cps/templates/user_edit.html:146
 msgid "Generate Kobo Auth URL"
 msgstr ""
 
-#: cps/templates/user_edit.html:166
-msgid "Do you really want to delete the Kobo Token?"
-msgstr ""
-
diff --git a/optional-requirements.txt b/optional-requirements.txt
index a2b05408..5087f4fa 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -7,7 +7,7 @@ oauth2client>=4.0.0,<4.1.4
 uritemplate>=3.0.0,<3.1.0
 pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
-PyDrive>=1.3.1,<1.4.0
+PyDrive2>=1.3.1,<1.8.0
 PyYAML>=3.12
 rsa==3.4.2,<4.1.0
 six>=1.10.0,<1.15.0
@@ -26,7 +26,6 @@ SQLAlchemy-Utils>=0.33.5,<0.37.0
 
 # extracting metadata
 lxml>=3.8.0,<4.6.0
-Pillow>=4.0.0,<7.2.0
 rarfile>=2.7
 
 # other
diff --git a/requirements.txt b/requirements.txt
index bfd8da7c..f154dd5b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Babel>=1.3, <2.9
-Flask-Babel>=0.11.1,<1.1.0
+Flask-Babel>=0.11.1,<2.1.0
 Flask-Login>=0.3.2,<0.5.1
 Flask-Principal>=0.3.2,<0.5.1
 singledispatch>=3.4.0.0,<3.5.0.0
@@ -11,5 +11,5 @@ pytz>=2016.10
 requests>=2.11.1,<2.25.0
 SQLAlchemy>=1.3.0,<1.4.0
 tornado>=4.1,<6.2
-Wand>=0.4.4,<0.6.0
+Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.2.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index e96fa1ac..027a3e46 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.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-12-02 15:51:36</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-01-02 07:53:24</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-12-02 18:01:04</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-01-02 10:58:22</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 41 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 37 min</p>
         </div>
       </div>
       </div>
@@ -236,13 +236,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestCli</td>
+        <td class="text-center">8</td>
         <td class="text-center">7</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('c2', 7)">Detail</a>
+            <a onclick="showClassDetail('c2', 8)">Detail</a>
         </td>
     </tr>
 
@@ -327,15 +327,24 @@
         </tr>
     
     
+    
+        <tr id='pt2.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCoverEditBooks</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</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('c3', 1)">Detail</a>
         </td>
@@ -343,31 +352,11 @@
 
     
     
-        <tr id="ft3.1" class="none bg-danger">
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.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_ft3.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 "/home/matthias/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>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -622,11 +611,11 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</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">
@@ -645,33 +634,11 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id="ft8.2" class="none bg-danger">
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft8.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_ft8.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py", line 212, in test_convert_only
-    self.assertEqual(ret[-1]['result'], 'Finished')
-AssertionError: 'Started' != 'Finished'
-- Started
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -686,12 +653,12 @@ AssertionError: 'Started' != 'Finished'
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">13</td>
-        <td class="text-center">11</td>
+        <td class="text-center">12</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c9', 13)">Detail</a>
@@ -763,33 +730,11 @@ AssertionError: 'Started' != 'Finished'
     
     
     
-        <tr id="et9.8" class="none bg-info">
+        <tr id='pt9.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et9.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et9.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_et9.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_additional_books.py", line 649, in test_title_sort
-    self.edit_book(1, content={'book_title': u'A bok'})
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1397, in edit_book
-    ele.send_keys(Keys.CONTROL, "a")
-AttributeError: 'bool' object has no attribute 'send_keys'</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1245,15 +1190,15 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">20</td>
         <td class="text-center">19</td>
-        <td class="text-center">19</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 19)">Detail</a>
+            <a onclick="showClassDetail('c12', 20)">Detail</a>
         </td>
     </tr>
 
@@ -1394,11 +1339,33 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id="ft12.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft12.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_ft12.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 213, in test_edit_title
+    self.assertEqual('No Cover', title.get_attribute('value'))
+AssertionError: 'No Cover' != 'The camicdemo'
+- No Cover
++ The camicdemo</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1429,6 +1396,15 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
         </tr>
     
     
+    
+        <tr id='pt12.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -1697,13 +1673,13 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
 
     <tr id="su" class="passClass">
         <td>TestLdapLogin</td>
-        <td class="text-center">12</td>
-        <td class="text-center">12</td>
+        <td class="text-center">13</td>
+        <td class="text-center">13</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('c18', 12)">Detail</a>
+            <a onclick="showClassDetail('c18', 13)">Detail</a>
         </td>
     </tr>
 
@@ -1756,7 +1732,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
         <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
+                <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1765,7 +1741,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
         <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
+                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1774,7 +1750,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
         <tr id='pt18.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
+                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1783,7 +1759,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
         <tr id='pt18.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
+                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1792,7 +1768,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
         <tr id='pt18.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
+                <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1801,7 +1777,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
         <tr id='pt18.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
+                <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1809,6 +1785,15 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
         <tr id='pt18.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt18.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -1915,13 +1900,13 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
 
     <tr id="su" class="passClass">
         <td>TestLogin</td>
-        <td class="text-center">12</td>
-        <td class="text-center">12</td>
+        <td class="text-center">13</td>
+        <td class="text-center">13</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('c20', 12)">Detail</a>
+            <a onclick="showClassDetail('c20', 13)">Detail</a>
         </td>
     </tr>
 
@@ -2019,7 +2004,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
         <tr id='pt20.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestLogin - test_next</div>
+                <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2027,6 +2012,15 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
         <tr id='pt20.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_next</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2071,13 +2065,13 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
 
     <tr id="su" class="passClass">
         <td>TestOPDSFeed</td>
-        <td class="text-center">20</td>
-        <td class="text-center">20</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">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 20)">Detail</a>
+            <a onclick="showClassDetail('c22', 21)">Detail</a>
         </td>
     </tr>
 
@@ -2255,6 +2249,15 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
         <tr id='pt22.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt22.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2264,11 +2267,11 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2314,31 +2317,11 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id="ft23.5" class="none bg-danger">
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <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_ft23.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.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_ft23.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 "/home/matthias/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')
-AssertionError: False is not true : Encoding of textfile viewer is not respected properly</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2657,6 +2640,30 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestUserLoad</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('c27', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt27.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserLoad - test_user_change_vis</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestUserTemplate</td>
         <td class="text-center">21</td>
@@ -2665,13 +2672,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('c27', 21)">Detail</a>
+            <a onclick="showClassDetail('c28', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -2680,7 +2687,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -2689,7 +2696,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -2698,7 +2705,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -2707,7 +2714,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -2716,7 +2723,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -2725,7 +2732,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -2734,7 +2741,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -2743,7 +2750,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -2752,7 +2759,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -2761,7 +2768,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -2770,7 +2777,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -2779,7 +2786,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -2788,7 +2795,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.14' class='hiddenRow bg-success'>
+        <tr id='pt28.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -2797,7 +2804,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.15' class='hiddenRow bg-success'>
+        <tr id='pt28.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -2806,7 +2813,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.16' class='hiddenRow bg-success'>
+        <tr id='pt28.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -2815,7 +2822,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.17' class='hiddenRow bg-success'>
+        <tr id='pt28.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -2824,7 +2831,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.18' class='hiddenRow bg-success'>
+        <tr id='pt28.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -2833,7 +2840,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.19' class='hiddenRow bg-success'>
+        <tr id='pt28.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -2842,7 +2849,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.20' class='hiddenRow bg-success'>
+        <tr id='pt28.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -2851,7 +2858,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt27.21' class='hiddenRow bg-success'>
+        <tr id='pt28.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -2861,21 +2868,21 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">33</td>
-        <td class="text-center">25</td>
+        <td class="text-center">33</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">8</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 33)">Detail</a>
+            <a onclick="showClassDetail('c29', 33)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -2884,7 +2891,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -2893,7 +2900,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -2902,7 +2909,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -2911,7 +2918,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -2920,38 +2927,16 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id="et28.6" class="none bg-info">
+        <tr id='pt29.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_et28.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 397, in test_admin_change_visibility_authors
-    self.verify_order("nav_author", 2, order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1128, in verify_order
-    book_id = int(books[1][index]['id'])
-TypeError: 'FirefoxWebElement' 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='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -2960,38 +2945,16 @@ TypeError: 'FirefoxWebElement' object is not subscriptable</pre>
     
     
     
-        <tr id="et28.8" class="none bg-info">
+        <tr id='pt29.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_et28.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 362, in test_admin_change_visibility_file_formats
-    self.verify_order("nav_format", 1, order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1128, in verify_order
-    book_id = int(books[1][index]['id'])
-TypeError: 'FirefoxWebElement' 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='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3000,69 +2963,25 @@ TypeError: 'FirefoxWebElement' object is not subscriptable</pre>
     
     
     
-        <tr id="et28.10" class="none bg-info">
+        <tr id='pt29.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_et28.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 249, in test_admin_change_visibility_language
-    self.verify_order("nav_lang", 0, order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1128, in verify_order
-    book_id = int(books[1][index]['id'])
-TypeError: 'FirefoxWebElement' 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="et28.11" class="none bg-info">
+        <tr id='pt29.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_et28.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 322, in test_admin_change_visibility_publisher
-    self.verify_order("nav_publisher", 0, order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1128, in verify_order
-    book_id = int(books[1][index]['id'])
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -3071,139 +2990,43 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="et28.13" class="none bg-info">
+        <tr id='pt29.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_et28.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 188, in test_admin_change_visibility_rated
-    self.verify_order("nav_rated", order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1128, in verify_order
-    book_id = int(books[1][index]['id'])
-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="et28.14" class="none bg-info">
+        <tr id='pt29.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_et28.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 342, in test_admin_change_visibility_rating
-    self.verify_order("nav_rate", 0, order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1117, in verify_order
-    list_elements[index].click()
-  File "/home/matthias/Entwicklung/calibre-web-test/test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py", line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py", line 633, in _execute
-    return self._parent.execute(command, params)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py", line 321, in execute
-    self.error_handler.check_response(response)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py", line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element <a id="list_0" href="/ratings/new/1"> could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et28.15" class="none bg-info">
+        <tr id='pt29.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_et28.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 229, in test_admin_change_visibility_read
-    self.verify_order("nav_unread", 0, order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1113, in verify_order
-    if not len(list_elements):
-TypeError: object of type 'bool' has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et28.16" class="none bg-info">
+        <tr id='pt29.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_et28.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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 "/home/matthias/Entwicklung/calibre-web-test/test/test_visiblilitys.py", line 302, in test_admin_change_visibility_series
-    self.verify_order("nav_serie", 0, order=order)
-  File "/home/matthias/Entwicklung/calibre-web-test/test/helper_ui.py", line 1128, in verify_order
-    book_id = int(books[1][index]['id'])
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt28.17' class='hiddenRow bg-success'>
+        <tr id='pt29.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -3212,7 +3035,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.18' class='hiddenRow bg-success'>
+        <tr id='pt29.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -3221,7 +3044,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.19' class='hiddenRow bg-success'>
+        <tr id='pt29.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -3230,7 +3053,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.20' class='hiddenRow bg-success'>
+        <tr id='pt29.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -3239,7 +3062,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.21' class='hiddenRow bg-success'>
+        <tr id='pt29.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -3248,7 +3071,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.22' class='hiddenRow bg-success'>
+        <tr id='pt29.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -3257,7 +3080,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.23' class='hiddenRow bg-success'>
+        <tr id='pt29.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -3266,7 +3089,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.24' class='hiddenRow bg-success'>
+        <tr id='pt29.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -3275,7 +3098,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.25' class='hiddenRow bg-success'>
+        <tr id='pt29.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -3284,7 +3107,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.26' class='hiddenRow bg-success'>
+        <tr id='pt29.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -3293,7 +3116,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.27' class='hiddenRow bg-success'>
+        <tr id='pt29.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -3302,7 +3125,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.28' class='hiddenRow bg-success'>
+        <tr id='pt29.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -3311,7 +3134,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.29' class='hiddenRow bg-success'>
+        <tr id='pt29.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -3320,7 +3143,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.30' class='hiddenRow bg-success'>
+        <tr id='pt29.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -3329,7 +3152,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.31' class='hiddenRow bg-success'>
+        <tr id='pt29.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -3338,7 +3161,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.32' class='hiddenRow bg-success'>
+        <tr id='pt29.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -3347,7 +3170,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.33' class='hiddenRow bg-success'>
+        <tr id='pt29.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -3365,13 +3188,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 16)">Detail</a>
+            <a onclick="showClassDetail('c30', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -3380,7 +3203,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -3389,7 +3212,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -3398,7 +3221,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -3407,7 +3230,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -3416,7 +3239,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -3425,7 +3248,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -3434,7 +3257,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -3443,7 +3266,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -3452,7 +3275,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -3461,7 +3284,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -3470,7 +3293,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -3479,7 +3302,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -3488,7 +3311,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -3497,7 +3320,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -3506,7 +3329,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.16' class='hiddenRow bg-success'>
+        <tr id='pt30.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -3517,10 +3340,10 @@ IndexError: list index out of range</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>288</td>
-        <td>269</td>
-        <td>3</td>
-        <td>9</td>
+        <td>294</td>
+        <td>286</td>
+        <td>1</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -3549,7 +3372,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.4.0-54-generic #60-Ubuntu SMP Fri Nov 6 10:37:59 UTC 2020 x86_64 x86_64</td>
+              <td>Linux 5.8.0-33-generic #36~20.04.1-Ubuntu SMP Wed Dec 9 17:01:13 UTC 2020 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -3579,7 +3402,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Flask-Babel</th>
-              <td>1.0.0</td>
+              <td>2.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -3615,7 +3438,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>pytz</th>
-              <td>2020.4</td>
+              <td>2020.5</td>
               <td>Basic</td>
             </tr>
           
@@ -3639,7 +3462,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.3.20</td>
+              <td>1.3.22</td>
               <td>Basic</td>
             </tr>
           
@@ -3651,13 +3474,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.1.1</td>
+              <td>1.1.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Wand</th>
-              <td>0.5.9</td>
+              <td>0.6.5</td>
               <td>Basic</td>
             </tr>
           
@@ -3667,12 +3490,6 @@ IndexError: list index out of range</pre>
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestCoverEditBooks</td>
-            </tr>
-          
             <tr>
               <th>google-api-python-client</th>
               <td>1.12.8</td>
@@ -3698,14 +3515,8 @@ IndexError: list index out of range</pre>
             </tr>
           
             <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEbookConvertCalibreGDrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -3740,14 +3551,8 @@ IndexError: list index out of range</pre>
             </tr>
           
             <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEbookConvertGDriveKepubify</td>
-            </tr>
-          
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -3769,12 +3574,6 @@ IndexError: list index out of range</pre>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
-            <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
             <tr>
               <th>rarfile</th>
               <td>4.0</td>
@@ -3787,12 +3586,6 @@ IndexError: list index out of range</pre>
               <td>TestEditBooks</td>
             </tr>
           
-            <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEditBooks</td>
-            </tr>
-          
             <tr>
               <th>google-api-python-client</th>
               <td>1.12.8</td>
@@ -3818,14 +3611,8 @@ IndexError: list index out of range</pre>
             </tr>
           
             <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEditBooksOnGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -3854,8 +3641,8 @@ IndexError: list index out of range</pre>
             </tr>
           
             <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -3915,7 +3702,7 @@ IndexError: list index out of range</pre>
 </div>
 
 <script>
-    drawCircle(269, 3, 9, 7);
+    drawCircle(286, 1, 0, 7);
 </script>
 
 </div>
diff --git a/test/Calibre-Web TestSummary_Windows.html b/test/Calibre-Web TestSummary_Windows.html
index 0c4136ea..eadf672d 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-12-02 18:51:45</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-01-02 08:38:57</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-12-02 21:19:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-01-02 12:04:50</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 56 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 58 min</p>
         </div>
       </div>
       </div>
@@ -236,13 +236,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestCli</td>
+        <td class="text-center">8</td>
         <td class="text-center">7</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('c2', 7)">Detail</a>
+            <a onclick="showClassDetail('c2', 8)">Detail</a>
         </td>
     </tr>
 
@@ -327,15 +327,24 @@
         </tr>
     
     
+    
+        <tr id='pt2.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCoverEditBooks</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</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('c3', 1)">Detail</a>
         </td>
@@ -343,31 +352,11 @@
 
     
     
-        <tr id="ft3.1" class="none bg-danger">
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.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_ft3.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_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>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -511,82 +500,134 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestEbookConvertCalibreGDrive</td>
-        <td class="text-center">6</td>
-        <td class="text-center">6</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 6)">Detail</a>
+            <a onclick="showClassDetail('c6', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id="et6.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
+                <div class='testcase'>setUpClass (test_ebook_convert_gdrive)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.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_et6.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_ebook_convert_gdrive.py", line 35, in setUpClass
+    prepare_gdrive()
+  File "C:\Entwicklung\calibre-web-test\test\helper_gdrive.py", line 36, in prepare_gdrive
+    test = fs.makedir('test')
+  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\fs\googledrivefs\googledrivefs.py", line 343, in makedir
+    raise DirectoryExists(path=path)
+fs.errors.DirectoryExists: directory 'test' exists</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt6.2' class='hiddenRow bg-success'>
+        <tr id="et6.2" class="none bg-info">
             <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
+                <div class='testcase'>setUpClass (test_ebook_convert_kepubify_gdrive)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.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_et6.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_ebook_convert_kepubify_gdrive.py", line 32, in setUpClass
+    prepare_gdrive()
+  File "C:\Entwicklung\calibre-web-test\test\helper_gdrive.py", line 30, in prepare_gdrive
+    fs.removetree('test')
+  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\fs\base.py", line 1232, in removetree
+    self.removedir(dir_path)
+  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\fs\googledrivefs\googledrivefs.py", line 395, in removedir
+    raise DirectoryNotEmpty(path=path)
+fs.errors.DirectoryNotEmpty: directory 'test' is not empty</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id="et6.3" class="none bg-info">
             <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
+                <div class='testcase'>tearDownClass (test_updater)</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.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_et6.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\test_updater.py", line 39, in tearDownClass
+    cls.stop_calibre_web()
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 370, in stop_calibre_web
+    cls.driver.find_element_by_id('admin_stop').click()
+AttributeError: 'NoneType' object has no attribute 'find_element_by_id'
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File "C:\Entwicklung\calibre-web-test\test\test_updater.py", line 41, 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-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertKepubify</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">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c7', 3)">Detail</a>
         </td>
@@ -594,193 +635,49 @@ AssertionError: False is not true : BMP file is not detected</pre>
 
     
     
-        <tr id="st7.1" class="none bg-warning">
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.1')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st7.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_st7.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Skipping convert, kepubify not found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st7.2" class="none bg-warning">
+        <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.2')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st7.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_st7.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Skipping convert, kepubify not found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st7.3" class="none bg-warning">
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.3')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st7.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_st7.3').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Skipping convert, kepubify not found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
     <tr id="su" class="skipClass">
-        <td>TestEbookConvertGDriveKepubify</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('c8', 3)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="st8.1" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</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">Skipping convert, kepubify not found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st8.2" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.2')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st8.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
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Skipping convert, kepubify not found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st8.3" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</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">Skipping convert, kepubify not found</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">13</td>
-        <td class="text-center">10</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 13)">Detail</a>
+            <a onclick="showClassDetail('c8', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
@@ -789,7 +686,7 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
@@ -798,7 +695,7 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
@@ -807,7 +704,7 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id='pt9.4' class='hiddenRow bg-success'>
+        <tr id='pt8.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
@@ -816,7 +713,7 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id='pt9.5' class='hiddenRow bg-success'>
+        <tr id='pt8.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
@@ -825,7 +722,7 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id='pt9.6' class='hiddenRow bg-success'>
+        <tr id='pt8.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
@@ -834,7 +731,7 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id='pt9.7' class='hiddenRow bg-success'>
+        <tr id='pt8.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -843,38 +740,16 @@ AssertionError: False is not true : BMP file is not detected</pre>
     
     
     
-        <tr id="et9.8" class="none bg-info">
+        <tr id='pt8.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et9.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et9.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_et9.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_edit_additional_books.py", line 650, in test_title_sort
-    self.edit_book(1, content={'book_title': u'A bok'})
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1397, in edit_book
-    ele.send_keys(Keys.CONTROL, "a")
-AttributeError: 'bool' object has no attribute 'send_keys'</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt9.9' class='hiddenRow bg-success'>
+        <tr id='pt8.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -883,7 +758,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt9.10' class='hiddenRow bg-success'>
+        <tr id='pt8.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -892,7 +767,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt9.11' class='hiddenRow bg-success'>
+        <tr id='pt8.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -901,19 +776,19 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id="st9.12" class="none bg-warning">
+        <tr id="st8.12" 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_st9.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st9.12" class="popup_window test_output" style="display:none;">
+                <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_st9.12').style.display='none'"><span
+                                onclick='document.getElementById('div_st8.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -927,19 +802,19 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id="st9.13" class="none bg-warning">
+        <tr id="st8.13" 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_st9.13')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st8.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st9.13" class="popup_window test_output" style="display:none;">
+                <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_st9.13').style.display='none'"><span
+                                onclick='document.getElementById('div_st8.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -962,13 +837,13 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 33)">Detail</a>
+            <a onclick="showClassDetail('c9', 33)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -977,7 +852,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.2' class='hiddenRow bg-success'>
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -986,7 +861,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.3' class='hiddenRow bg-success'>
+        <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -995,7 +870,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.4' class='hiddenRow bg-success'>
+        <tr id='pt9.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1004,7 +879,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.5' class='hiddenRow bg-success'>
+        <tr id='pt9.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1013,7 +888,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.6' class='hiddenRow bg-success'>
+        <tr id='pt9.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1022,7 +897,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.7' class='hiddenRow bg-success'>
+        <tr id='pt9.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1031,7 +906,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id='pt9.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1040,7 +915,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.9' class='hiddenRow bg-success'>
+        <tr id='pt9.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1049,7 +924,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id='pt9.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1058,7 +933,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id='pt9.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1067,7 +942,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.12' class='hiddenRow bg-success'>
+        <tr id='pt9.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1076,7 +951,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id='pt9.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1085,19 +960,19 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id="st10.14" class="none bg-warning">
+        <tr id="st9.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_st10.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st9.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st9.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_st10.14').style.display='none'"><span
+                                onclick='document.getElementById('div_st9.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1111,7 +986,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.15' class='hiddenRow bg-success'>
+        <tr id='pt9.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1120,7 +995,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt9.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1129,7 +1004,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt9.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1138,19 +1013,19 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id="st10.18" class="none bg-warning">
+        <tr id="st9.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_st10.18')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st9.18')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.18" class="popup_window test_output" style="display:none;">
+                <div id="div_st9.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_st10.18').style.display='none'"><span
+                                onclick='document.getElementById('div_st9.18').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1164,7 +1039,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.19' class='hiddenRow bg-success'>
+        <tr id='pt9.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1173,7 +1048,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.20' class='hiddenRow bg-success'>
+        <tr id='pt9.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1182,7 +1057,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.21' class='hiddenRow bg-success'>
+        <tr id='pt9.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1191,7 +1066,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.22' class='hiddenRow bg-success'>
+        <tr id='pt9.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1200,7 +1075,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.23' class='hiddenRow bg-success'>
+        <tr id='pt9.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1209,7 +1084,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.24' class='hiddenRow bg-success'>
+        <tr id='pt9.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1218,7 +1093,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.25' class='hiddenRow bg-success'>
+        <tr id='pt9.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1227,7 +1102,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.26' class='hiddenRow bg-success'>
+        <tr id='pt9.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1236,7 +1111,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.27' class='hiddenRow bg-success'>
+        <tr id='pt9.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1245,7 +1120,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.28' class='hiddenRow bg-success'>
+        <tr id='pt9.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1254,7 +1129,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.29' class='hiddenRow bg-success'>
+        <tr id='pt9.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1263,7 +1138,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.30' class='hiddenRow bg-success'>
+        <tr id='pt9.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1272,7 +1147,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.31' class='hiddenRow bg-success'>
+        <tr id='pt9.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1281,7 +1156,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.32' class='hiddenRow bg-success'>
+        <tr id='pt9.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1290,7 +1165,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt10.33' class='hiddenRow bg-success'>
+        <tr id='pt9.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1308,13 +1183,13 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 3)">Detail</a>
+            <a onclick="showClassDetail('c10', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_edit_books_list</div>
             </td>
@@ -1323,7 +1198,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1332,7 +1207,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_merge_book</div>
             </td>
@@ -1345,18 +1220,18 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">18</td>
-        <td class="text-center">2</td>
+        <td class="text-center">19</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 20)">Detail</a>
+            <a onclick="showClassDetail('c11', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1365,7 +1240,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1374,7 +1249,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1383,7 +1258,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1392,7 +1267,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1401,7 +1276,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1410,7 +1285,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1419,7 +1294,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1428,7 +1303,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1437,7 +1312,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1446,7 +1321,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1455,7 +1330,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1464,7 +1339,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1473,7 +1348,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1482,7 +1357,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1491,7 +1366,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1500,7 +1375,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1509,7 +1384,7 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1518,26 +1393,26 @@ AttributeError: 'bool' object has no attribute 'send_keys'</pre>
     
     
     
-        <tr id="ft12.19" class="none bg-danger">
+        <tr id="ft11.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_ft12.19')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.19')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft12.19" class="popup_window test_output" style="display:none;">
+                <div id="div_ft11.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_ft12.19').style.display='none'"><span
+                                onclick='document.getElementById('div_ft11.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\test_edit_ebooks_gdrive.py", line 700, in test_upload_cover_hdd
-    self.assertGreater(diff('original.png', 'jpeg.png', delete_diff_file=True), 0.02)
-AssertionError: 0.0 not greater than 0.02</pre>
+  File "C:\Entwicklung\calibre-web-test\test\test_edit_ebooks_gdrive.py", line 716, in test_upload_cover_hdd
+    self.assertGreater(diff('bmp.png', 'jpeg.png', delete_diff_file=True), 0.006)
+AssertionError: 0.003931532360116369 not greater than 0.006</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1547,31 +1422,11 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
-        <tr id="ft12.20" class="none bg-danger">
+        <tr id='pt11.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft12.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_ft12.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\test_edit_ebooks_gdrive.py", line 814, in test_watch_metadata
-    self.assertTrue(self.check_element_on_page((By.ID, "config_google_drive_watch_changes_response")))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1585,13 +1440,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 3)">Detail</a>
+            <a onclick="showClassDetail('c12', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1600,7 +1455,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1609,7 +1464,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1627,13 +1482,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 5)">Detail</a>
+            <a onclick="showClassDetail('c13', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1642,7 +1497,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1651,7 +1506,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1660,7 +1515,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1669,7 +1524,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1687,13 +1542,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c14', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1711,13 +1566,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 3)">Detail</a>
+            <a onclick="showClassDetail('c15', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1726,7 +1581,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -1735,7 +1590,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -1753,13 +1608,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 9)">Detail</a>
+            <a onclick="showClassDetail('c16', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -1768,7 +1623,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -1777,7 +1632,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -1786,7 +1641,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -1795,7 +1650,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -1804,7 +1659,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -1813,7 +1668,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -1822,7 +1677,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -1831,7 +1686,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -1843,19 +1698,19 @@ AssertionError: False is not true</pre>
 
     <tr id="su" class="passClass">
         <td>TestLdapLogin</td>
-        <td class="text-center">12</td>
-        <td class="text-center">12</td>
+        <td class="text-center">13</td>
+        <td class="text-center">13</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('c18', 12)">Detail</a>
+            <a onclick="showClassDetail('c17', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -1864,7 +1719,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -1873,7 +1728,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -1882,7 +1737,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -1891,7 +1746,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -1900,7 +1755,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -1909,7 +1773,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt17.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -1918,7 +1782,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.8' class='hiddenRow bg-success'>
+        <tr id='pt17.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -1927,7 +1791,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.9' class='hiddenRow bg-success'>
+        <tr id='pt17.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -1936,7 +1800,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.10' class='hiddenRow bg-success'>
+        <tr id='pt17.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -1945,7 +1809,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.11' class='hiddenRow bg-success'>
+        <tr id='pt17.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -1954,7 +1818,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt18.12' class='hiddenRow bg-success'>
+        <tr id='pt17.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -1972,13 +1836,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 7)">Detail</a>
+            <a onclick="showClassDetail('c18', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -1987,7 +1851,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -1996,7 +1860,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2005,19 +1869,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st19.4" class="none bg-warning">
+        <tr id="st18.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_st19.4')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st18.4')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st19.4" class="popup_window test_output" style="display:none;">
+                <div id="div_st18.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_st19.4').style.display='none'"><span
+                                onclick='document.getElementById('div_st18.4').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2031,7 +1895,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2040,7 +1904,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2049,7 +1913,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2061,19 +1925,19 @@ AssertionError: False is not true</pre>
 
     <tr id="su" class="passClass">
         <td>TestLogin</td>
-        <td class="text-center">12</td>
-        <td class="text-center">12</td>
+        <td class="text-center">13</td>
+        <td class="text-center">13</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('c20', 12)">Detail</a>
+            <a onclick="showClassDetail('c19', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2082,7 +1946,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2091,7 +1955,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2100,7 +1964,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2109,7 +1973,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2118,7 +1982,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2127,7 +1991,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2136,7 +2000,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.8' class='hiddenRow bg-success'>
+        <tr id='pt19.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2145,7 +2009,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.9' class='hiddenRow bg-success'>
+        <tr id='pt19.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2154,7 +2018,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.10' class='hiddenRow bg-success'>
+        <tr id='pt19.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2163,7 +2027,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.11' class='hiddenRow bg-success'>
+        <tr id='pt19.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_magic_remote_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt19.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2172,7 +2045,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.12' class='hiddenRow bg-success'>
+        <tr id='pt19.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2190,13 +2063,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 2)">Detail</a>
+            <a onclick="showClassDetail('c20', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2205,7 +2078,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2223,13 +2096,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 21)">Detail</a>
+            <a onclick="showClassDetail('c21', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2238,7 +2111,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2247,7 +2120,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2256,7 +2129,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2265,7 +2138,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id='pt21.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2274,7 +2147,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.6' class='hiddenRow bg-success'>
+        <tr id='pt21.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2283,7 +2156,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.7' class='hiddenRow bg-success'>
+        <tr id='pt21.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2292,7 +2165,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.8' class='hiddenRow bg-success'>
+        <tr id='pt21.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2301,7 +2174,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.9' class='hiddenRow bg-success'>
+        <tr id='pt21.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2310,7 +2183,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.10' class='hiddenRow bg-success'>
+        <tr id='pt21.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2319,7 +2192,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.11' class='hiddenRow bg-success'>
+        <tr id='pt21.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2328,7 +2201,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.12' class='hiddenRow bg-success'>
+        <tr id='pt21.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2337,7 +2210,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.13' class='hiddenRow bg-success'>
+        <tr id='pt21.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2346,7 +2219,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.14' class='hiddenRow bg-success'>
+        <tr id='pt21.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2355,7 +2228,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.15' class='hiddenRow bg-success'>
+        <tr id='pt21.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2364,7 +2237,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.16' class='hiddenRow bg-success'>
+        <tr id='pt21.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2373,7 +2246,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.17' class='hiddenRow bg-success'>
+        <tr id='pt21.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2382,7 +2255,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.18' class='hiddenRow bg-success'>
+        <tr id='pt21.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2391,7 +2264,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.19' class='hiddenRow bg-success'>
+        <tr id='pt21.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2400,7 +2273,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.20' class='hiddenRow bg-success'>
+        <tr id='pt21.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2409,7 +2282,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.21' class='hiddenRow bg-success'>
+        <tr id='pt21.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2419,21 +2292,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
+        <td class="text-center">5</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('c23', 5)">Detail</a>
+            <a onclick="showClassDetail('c22', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -2442,7 +2315,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -2451,7 +2324,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -2460,65 +2333,20 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft23.4" class="none bg-danger">
+        <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.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_ft23.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_reader.py", line 189, in test_sound_listener
-    self.sound_test('music.flac', 'Unknown - music', '0:02')
-  File "C:\Entwicklung\calibre-web-test\test\test_reader.py", line 176, in sound_test
-    self.assertEqual(title, title_item.text)
-AssertionError: 'Unknown - music' != '✖ ✖ Unknown - music'
-- Unknown - music
-+ ✖ ✖ Unknown - music
-? ++++</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft23.5" class="none bg-danger">
+        <tr id='pt22.5' class='hiddenRow bg-success'>
             <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_ft23.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.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_ft23.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')
-AssertionError: False is not true : Encoding of textfile viewer is not respected properly</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2532,13 +2360,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('c24', 7)">Detail</a>
+            <a onclick="showClassDetail('c23', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -2547,7 +2375,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -2556,7 +2384,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -2565,7 +2393,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -2574,7 +2402,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -2583,7 +2411,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -2592,7 +2420,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -2610,13 +2438,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('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -2625,7 +2453,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -2634,7 +2462,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -2643,7 +2471,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -2652,7 +2480,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -2661,7 +2489,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -2670,7 +2498,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -2679,7 +2507,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -2688,7 +2516,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -2697,19 +2525,19 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id="st25.10" class="none bg-warning">
+        <tr id="st24.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_st25.10')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st24.10')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st25.10" class="popup_window test_output" style="display:none;">
+                <div id="div_st24.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_st25.10').style.display='none'"><span
+                                onclick='document.getElementById('div_st24.10').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2723,7 +2551,7 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -2735,91 +2563,48 @@ AssertionError: False is not true : Encoding of textfile viewer is not respected
 
     <tr id="su" class="errorClass">
         <td>TestUpdater</td>
-        <td class="text-center">8</td>
-        <td class="text-center">6</td>
+        <td class="text-center">15</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">14</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 8)">Detail</a>
+            <a onclick="showClassDetail('c25', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id="et25.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt26.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt26.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt26.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt26.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="et26.6" class="none bg-info">
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
-            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.6')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et26.6" class="popup_window test_output" style="display:none;">
+                <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_et26.6').style.display='none'"><span
+                                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\test_updater.py", line 296, in test_perform_update_stable_errors
-    performUpdate.click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webelement.py", line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webelement.py", line 633, in _execute
-    return self._parent.execute(command, params)
-  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.ElementNotInteractableException: Message: Element <div id="perform_update" class="btn btn-primary hidden"> could not be scrolled into view</pre>
+  File "C:\Entwicklung\calibre-web-test\test\test_updater.py", line 206, in test_check_update_nightly_errors
+    self.fill_basic_config({'config_updatechannel': 'Nightly'})
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 282, in fill_basic_config
+    cls.fill_initial_config(elements)
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 198, 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>
@@ -2829,19 +2614,448 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element <di
     
     
     
-        <tr id="st26.7" class="none bg-warning">
+        <tr id="et25.2" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</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\test_updater.py", line 55, in tearDown
+    if not self.check_user_logged_in('admin'):
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 88, 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 633, 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)
+AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et25.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</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\test_updater.py", line 234, in test_check_update_nightly_request_errors
+    self.fill_basic_config({'config_updatechannel': 'Nightly'})
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 282, in fill_basic_config
+    cls.fill_initial_config(elements)
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 198, 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="et25.4" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</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\test_updater.py", line 55, in tearDown
+    if not self.check_user_logged_in('admin'):
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 88, 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 633, 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)
+AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et25.5" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_stable_errors</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\test_updater.py", line 118, in test_check_update_stable_errors
+    self.fill_basic_config({'config_updatechannel': 'Stable'})
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 282, in fill_basic_config
+    cls.fill_initial_config(elements)
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 198, 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="et25.6" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_stable_errors</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\test_updater.py", line 55, in tearDown
+    if not self.check_user_logged_in('admin'):
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 88, 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 633, 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)
+AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et25.7" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_stable_versions</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\test_updater.py", line 146, in test_check_update_stable_versions
+    self.fill_basic_config({'config_updatechannel': 'Stable'})
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 282, in fill_basic_config
+    cls.fill_initial_config(elements)
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 198, 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="et25.8" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_stable_versions</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\test_updater.py", line 55, in tearDown
+    if not self.check_user_logged_in('admin'):
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 88, 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 633, 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)
+AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et25.9" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update</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\test_updater.py", line 341, in test_perform_update
+    self.fill_basic_config({'config_updatechannel': 'Stable'})
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 282, in fill_basic_config
+    cls.fill_initial_config(elements)
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 198, 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="et25.10" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update</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\test_updater.py", line 55, in tearDown
+    if not self.check_user_logged_in('admin'):
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 88, 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 633, 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)
+AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et25.11" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</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\test_updater.py", line 288, in test_perform_update_stable_errors
+    self.fill_basic_config({'config_updatechannel': 'Stable'})
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 282, in fill_basic_config
+    cls.fill_initial_config(elements)
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 198, 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="et25.12" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</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\test_updater.py", line 55, in tearDown
+    if not self.check_user_logged_in('admin'):
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 88, 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 633, 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)
+AttributeError: 'NoneType' object has no attribute 'find_element'</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="st25.13" 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_st26.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st25.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_st26.7').style.display='none'"><span
+                                onclick='document.getElementById('div_st25.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2855,10 +3069,95 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element <di
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id="et25.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</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\test_updater.py", line 366, in test_reconnect_database
+    self.reconnect_database()
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 356, in reconnect_database
+    self.driver.find_element_by_id('restart_database').click()
+AttributeError: 'NoneType' object has no attribute 'find_element_by_id'</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et25.15" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_reconnect_database</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\test_updater.py", line 55, in tearDown
+    if not self.check_user_logged_in('admin'):
+  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 88, 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 633, 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)
+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="passClass">
+        <td>TestUserLoad</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('c26', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt26.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserLoad - test_user_change_vis</div>
+            </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
@@ -3069,12 +3368,12 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element <di
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">33</td>
-        <td class="text-center">31</td>
+        <td class="text-center">33</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c28', 33)">Detail</a>
@@ -3200,72 +3499,20 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element <di
     
     
     
-        <tr id="et28.14" class="none bg-info">
+        <tr id='pt28.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_et28.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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\test_visiblilitys.py", line 342, in test_admin_change_visibility_rating
-    self.verify_order("nav_rate", 0, order=order)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1117, in verify_order
-    list_elements[index].click()
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webelement.py", line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File "C:\Entwicklung\calibre-web-test\test\venv\lib\site-packages\selenium\webdriver\remote\webelement.py", line 633, in _execute
-    return self._parent.execute(command, params)
-  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.ElementNotInteractableException: Message: Element <a id="list_0" href="/ratings/new/1"> could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et28.15" class="none bg-info">
+        <tr id='pt28.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_et28.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.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_et28.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\test_visiblilitys.py", line 229, in test_admin_change_visibility_read
-    self.verify_order("nav_unread", 0, order=order)
-  File "C:\Entwicklung\calibre-web-test\test\helper_ui.py", line 1113, in verify_order
-    if not len(list_elements):
-TypeError: object of type 'bool' has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3593,11 +3840,11 @@ TypeError: object of type 'bool' has no len()</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>290</td>
-        <td>267</td>
-        <td>5</td>
-        <td>4</td>
-        <td>14</td>
+        <td>295</td>
+        <td>269</td>
+        <td>1</td>
+        <td>17</td>
+        <td>8</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -3631,13 +3878,13 @@ TypeError: object of type 'bool' has no len()</pre>
           
             <tr>
               <th>Python</th>
-              <td>3.8.3</td>
+              <td>3.8.6</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Babel</th>
-              <td>2.8.0</td>
+              <td>2.8.1</td>
               <td>Basic</td>
             </tr>
           
@@ -3655,7 +3902,7 @@ TypeError: object of type 'bool' has no len()</pre>
           
             <tr>
               <th>Flask-Babel</th>
-              <td>1.0.0</td>
+              <td>2.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -3683,24 +3930,6 @@ TypeError: object of type 'bool' has no len()</pre>
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>natsort</th>
-              <td>7.0.1</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>pyasn1</th>
-              <td>0.4.8</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>pyasn1-modules</th>
-              <td>0.2.8</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>PyPDF2</th>
               <td>1.26.0</td>
@@ -3709,19 +3938,13 @@ TypeError: object of type 'bool' has no len()</pre>
           
             <tr>
               <th>pytz</th>
-              <td>2020.1</td>
+              <td>2020.5</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>requests</th>
-              <td>2.23.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>rsa</th>
-              <td>4.6</td>
+              <td>2.24.0</td>
               <td>Basic</td>
             </tr>
           
@@ -3739,31 +3962,25 @@ TypeError: object of type 'bool' has no len()</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.3.19</td>
+              <td>1.3.22</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>tornado</th>
-              <td>6.0.4</td>
+              <td>6.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.1.1</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>uritemplate</th>
-              <td>3.0.1</td>
+              <td>1.1.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Wand</th>
-              <td>0.5.9</td>
+              <td>0.6.5</td>
               <td>Basic</td>
             </tr>
           
@@ -3773,12 +3990,6 @@ TypeError: object of type 'bool' has no len()</pre>
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestCoverEditBooks</td>
-            </tr>
-          
             <tr>
               <th>google-api-python-client</th>
               <td>1.12.8</td>
@@ -3804,14 +4015,8 @@ TypeError: object of type 'bool' has no len()</pre>
             </tr>
           
             <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEbookConvertCalibreGDrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -3821,6 +4026,42 @@ TypeError: object of type 'bool' has no len()</pre>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
+            <tr>
+              <th>google-api-python-client</th>
+              <td>1.12.8</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.18.1</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
+            <tr>
+              <th>lxml</th>
+              <td>4.6.2</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>5.3.1</td>
+              <td>TestEbookConvertGDriveKepubify</td>
+            </tr>
+          
             <tr>
               <th>comicapi</th>
               <td>2.1.2</td>
@@ -3833,12 +4074,6 @@ TypeError: object of type 'bool' has no len()</pre>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
-            <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
             <tr>
               <th>rarfile</th>
               <td>4.0</td>
@@ -3851,12 +4086,6 @@ TypeError: object of type 'bool' has no len()</pre>
               <td>TestEditBooks</td>
             </tr>
           
-            <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEditBooks</td>
-            </tr>
-          
             <tr>
               <th>google-api-python-client</th>
               <td>1.12.8</td>
@@ -3882,14 +4111,8 @@ TypeError: object of type 'bool' has no len()</pre>
             </tr>
           
             <tr>
-              <th>Pillow</th>
-              <td>8.0.1</td>
-              <td>TestEditBooksOnGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -3918,8 +4141,8 @@ TypeError: object of type 'bool' has no len()</pre>
             </tr>
           
             <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
+              <th>PyDrive2</th>
+              <td>1.7.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -3973,7 +4196,7 @@ TypeError: object of type 'bool' has no len()</pre>
 </div>
 
 <script>
-    drawCircle(267, 5, 4, 14);
+    drawCircle(269, 1, 17, 8);
 </script>
 
 </div>